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

Avoid layout scalebar resizing to huge widths in extreme situations #58794

Merged
merged 1 commit into from
Sep 19, 2024

Conversation

nyalldawson
Copy link
Collaborator

Eg when trying to show a 1m scalebar for a global map

(spin off from #58677)

Eg when trying to show a 1m scalebar for a global map
@github-actions github-actions bot added this to the 3.40.0 milestone Sep 18, 2024
Copy link

🪟 Windows builds ready!

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

(Built from commit b9a0f52)

@nyalldawson nyalldawson merged commit 9117ea9 into qgis:master Sep 19, 2024
35 checks passed
@nyalldawson nyalldawson deleted the fix_layout_corruption branch September 19, 2024 19:53
@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 b9a0f52964b... Avoid layout scalebar resizing to huge widths in extreme situations
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 src/core/scalebar/qgsscalebarrenderer.cpp
CONFLICT (content): Merge conflict in src/core/scalebar/qgsscalebarrenderer.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_34 release-3_34
# Navigate to the new working tree
cd .worktrees/backport-release-3_34
# Create a new branch
git switch --create backport-58794-to-release-3_34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b9a0f52964b5236ff29e02e37cd7455275117bdc
# Push it to GitHub
git push --set-upstream origin backport-58794-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-58794-to-release-3_34.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Sep 19, 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.

3 participants