Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GDALOpen(): avoid error messages in OF_SHARED mode and with OVERVIEW_LEVEL option (fixes #8599) #8616

Merged
merged 1 commit into from
Oct 27, 2023

Conversation

rouault
Copy link
Member

@rouault rouault commented Oct 26, 2023

No description provided.

@coveralls
Copy link
Collaborator

Coverage Status

coverage: 67.808% (+0.001%) from 67.807% when pulling 666677b on rouault:fix_8599 into 5d3638a on OSGeo:master.

@rouault rouault merged commit 941f1a5 into OSGeo:master Oct 27, 2023
@rouault
Copy link
Member Author

rouault commented Oct 27, 2023

The backport to release/3.7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 666677b401... GDALOpen(): avoid error messages in OF_SHARED mode and with OVERVIEW_LEVEL option (fixes #8599)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging autotest/cpp/test_gdal.cpp
CONFLICT (content): Merge conflict in autotest/cpp/test_gdal.cpp
Auto-merging gcore/gdaldataset.cpp
CONFLICT (content): Merge conflict in gcore/gdaldataset.cpp

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.7 release/3.7
# Navigate to the new working tree
cd .worktrees/backport-release/3.7
# Create a new branch
git switch --create backport-8616-to-release/3.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 666677b401bdcda43aa41c0bc67abb6d0f0e93ff
# Push it to GitHub
git push --set-upstream origin backport-8616-to-release/3.7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.7

Then, create a pull request where the base branch is release/3.7 and the compare/head branch is backport-8616-to-release/3.7.

@rouault
Copy link
Member Author

rouault commented Oct 27, 2023

not appropriate for 3.7 backport as initial fix only made to master 3.8dev

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants