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

Allow LOCAL_CS with 3 axes #3928

Merged
merged 1 commit into from
Oct 19, 2023
Merged

Conversation

jjimenezshaw
Copy link
Contributor

Closes https://lists.osgeo.org/pipermail/proj/2023-October/011151.html

  • Tests added
  • Added clear title that can be used to generate release notes

@rouault rouault merged commit 68b4284 into OSGeo:master Oct 19, 2023
20 checks passed
@rouault
Copy link
Member

rouault commented Oct 19, 2023

The backport to 9.3 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply ef508846... allow LOCAL_CS with 3 axes
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 src/iso19111/io.cpp
CONFLICT (content): Merge conflict in src/iso19111/io.cpp
Auto-merging test/unit/test_io.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-9.3 9.3
# Navigate to the new working tree
cd .worktrees/backport-9.3
# Create a new branch
git switch --create backport-3928-to-9.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ef508846c1429463b8acc44657c254c1c7c21b92
# Push it to GitHub
git push --set-upstream origin backport-3928-to-9.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-9.3

Then, create a pull request where the base branch is 9.3 and the compare/head branch is backport-3928-to-9.3.

@rouault
Copy link
Member

rouault commented Oct 19, 2023

cherry picked to 9.3 per 09419f0

@rouault rouault added this to the 9.3.1 milestone Oct 19, 2023
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