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

SWIG: add inverseCT optional parameter to CoordinateOperation.SetOperation(), and add CoordinateOperation.GetInverse() #6175

Merged
merged 1 commit into from Aug 10, 2022

Conversation

rouault
Copy link
Member

@rouault rouault commented Aug 9, 2022

@rouault rouault merged commit 126fc2c into OSGeo:master Aug 10, 2022
@rouault
Copy link
Member Author

rouault commented Aug 10, 2022

The backport to release/3.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 6bd07b20b3... SWIG: add inverseCT optional parameter to CoordinateOperation.SetOperation(), and add CoordinateOperation.GetInverse()
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 swig/include/osr.i
Auto-merging swig/python/extensions/osr_wrap.cpp
Auto-merging swig/python/osgeo/osr.py
CONFLICT (content): Merge conflict in swig/python/osgeo/osr.py

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.5 release/3.5
# Navigate to the new working tree
cd .worktrees/backport-release/3.5
# Create a new branch
git switch --create backport-6175-to-release/3.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 6bd07b20b3e55c2fc94da611244a615a4fd2991f
# Push it to GitHub
git push --set-upstream origin backport-6175-to-release/3.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.5

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

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.

None yet

1 participant