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

Catch potential QgsCsException at various places; improve qgscoordinatetransform.h doc #56212

Merged
merged 5 commits into from Feb 7, 2024

Conversation

rouault
Copy link
Contributor

@rouault rouault commented Feb 6, 2024

No description provided.

Copy link

github-actions bot commented Feb 6, 2024

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit f9835d5)

src/core/proj/qgscoordinatetransform.h Outdated Show resolved Hide resolved
@rouault rouault merged commit 9631b3d into qgis:master Feb 7, 2024
29 checks passed
@qgis-bot
Copy link
Collaborator

qgis-bot commented Feb 7, 2024

The backport to release-3_34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply d43ceb45b64... qgscoordinatetransform.h: add a couple missing SIP_THROW( QgsCsException ), and add Doxygen \throw hint to make it obvious exceptions might be thrown
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
CONFLICT (modify/delete): python/PyQt6/core/auto_generated/proj/qgscoordinatetransform.sip.in deleted in HEAD and modified in d43ceb45b64 (qgscoordinatetransform.h: add a couple missing SIP_THROW( QgsCsException ), and add Doxygen \throw hint to make it obvious exceptions might be thrown).  Version d43ceb45b64 (qgscoordinatetransform.h: add a couple missing SIP_THROW( QgsCsException ), and add Doxygen \throw hint to make it obvious exceptions might be thrown) of python/PyQt6/core/auto_generated/proj/qgscoordinatetransform.sip.in left in tree.

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_34 release-3_34
# Navigate to the new working tree
cd .worktrees/backport-release-3_34
# Create a new branch
git switch --create backport-56212-to-release-3_34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick d43ceb45b64b2715f55cb19e1aa3a91aa219ac1f,c9079645f1ef21e7fda7b64d83587e7d58b345ee,fa4da34df21f33888b3c0a686657d0493f5b7e36,fecc5ed6d73ab55cead4ef9235fd42f98f49c355,f9835d5f4d66ae1f1c200a5f3957cf8e3bba9936
# Push it to GitHub
git push --set-upstream origin backport-56212-to-release-3_34
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_34

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Feb 7, 2024
@rouault
Copy link
Contributor Author

rouault commented Feb 7, 2024

manually backported in #56244

@rouault rouault removed the failed backport The automated backport attempt failed, needs a manual backport label Feb 7, 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.

None yet

3 participants