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

OpenFileGDB: exclude straight line segments when parsing arcs #10791

Merged
merged 1 commit into from
Sep 13, 2024

Conversation

rouault
Copy link
Member

@rouault rouault commented Sep 13, 2024

Cf #10763

@rouault rouault merged commit 6a5ab0e into OSGeo:master Sep 13, 2024
37 checks passed
@rouault
Copy link
Member Author

rouault commented Sep 13, 2024

The backport to release/3.9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 56b9c4f06a... OpenFileGDB: exclude straight line segments when parsing arcs
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".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging autotest/ogr/ogr_openfilegdb.py
CONFLICT (content): Merge conflict in autotest/ogr/ogr_openfilegdb.py
Auto-merging ogr/ogrpgeogeometry.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.9 release/3.9
# Navigate to the new working tree
cd .worktrees/backport-release/3.9
# Create a new branch
git switch --create backport-10791-to-release/3.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 56b9c4f06a8ea0a7f3eb8ff7ede834d39e14b44c
# Push it to GitHub
git push --set-upstream origin backport-10791-to-release/3.9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.9

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

@rouault
Copy link
Member Author

rouault commented Sep 13, 2024

manually cherry-picked to 3.9 per e10ed28

@rouault rouault added this to the 3.9.3 milestone Sep 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants