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

Fix calculation of string stats when nulls are present on Qt 6 builds #56305

Merged
merged 2 commits into from Feb 12, 2024

Conversation

nyalldawson
Copy link
Collaborator

No description provided.

@github-actions github-actions bot added this to the 3.36.0 milestone Feb 12, 2024
Copy link
Contributor

@nirvn nirvn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A fix in src/core under Qt6? Nice!

@nyalldawson nyalldawson merged commit a01b3b7 into qgis:master Feb 12, 2024
28 of 30 checks passed
@nyalldawson nyalldawson deleted the string_stats_null branch February 12, 2024 09:43
@qgis-bot
Copy link
Collaborator

The backport to release-3_34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 42512dc24a9... Fix calculation of string stats when nulls are present on Qt 6 builds
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/core/qgsstringstatisticalsummary.cpp
Auto-merging tests/src/python/test_qgsstringstatisticalsummary.py
CONFLICT (content): Merge conflict in tests/src/python/test_qgsstringstatisticalsummary.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_34 release-3_34
# Navigate to the new working tree
cd .worktrees/backport-release-3_34
# Create a new branch
git switch --create backport-56305-to-release-3_34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 42512dc24a92a62371c8d1df19c6e909603310b4,980920eed7cdd53f363e08932e6938e1042092e4
# Push it to GitHub
git push --set-upstream origin backport-56305-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-56305-to-release-3_34.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Feb 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_34 failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants