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

[Sip] Don't use deprecated annotation with message #60363

Merged
merged 1 commit into from
Jan 30, 2025

Conversation

troopa81
Copy link
Contributor

It crashes in 6.9.1, I'll restore it when everything is fixed. Reason of crash for context here

Fixes #60286

@github-actions github-actions bot added this to the 3.42.0 milestone Jan 30, 2025
Copy link

github-actions bot commented Jan 30, 2025

🪟 Windows builds

Download Windows builds of this PR for testing.
Debug symbols for this build are available here.
(Built from commit 789f584)

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
(Built from commit 789f584)

@agiudiceandrea
Copy link
Contributor

Is the backport to release-3_40 actually needed?

@nyalldawson nyalldawson merged commit 176890f into qgis:master Jan 30, 2025
38 checks passed
@qgis-bot
Copy link
Collaborator

The backport to release-3_40 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 789f58439fb... fix(SipDeprecated): Don't use deprecated annotation with message
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 set advice.mergeConflict false"

stdout
Auto-merging cmake/SIPMacros.cmake
CONFLICT (content): Merge conflict in cmake/SIPMacros.cmake

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

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Jan 30, 2025
@troopa81
Copy link
Contributor Author

Is the backport to release-3_40 actually needed?

No you're right the feature was added after3.40

@troopa81 troopa81 removed failed backport The automated backport attempt failed, needs a manual backport backport release-3_40 labels Jan 31, 2025
@agiudiceandrea
Copy link
Contributor

QGIS 3.41.0-Master from OSGeo4W on Windows 10 no longer crashes after this PR. Thanks!

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.

QMS plugin crashes in master
4 participants