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 handling of multiple consecutive tabs with HTML text rendering #60299

Merged
merged 1 commit into from
Jan 29, 2025

Conversation

nyalldawson
Copy link
Collaborator

Refs #60098

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

github-actions bot commented Jan 28, 2025

🪟 Windows builds

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

🪟 Windows Qt6 builds

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

@nyalldawson nyalldawson mentioned this pull request Jan 28, 2025
2 tasks
@nyalldawson nyalldawson force-pushed the fix_html_multiple_tabs branch from 157e57e to 3d8722c Compare January 28, 2025 02:15
@qgis qgis deleted a comment from github-actions bot Jan 28, 2025
@nyalldawson nyalldawson force-pushed the fix_html_multiple_tabs branch from 3d8722c to 58591ae Compare January 28, 2025 04:03
@qgis qgis deleted a comment from github-actions bot Jan 28, 2025
@nyalldawson nyalldawson force-pushed the fix_html_multiple_tabs branch from 58591ae to c2782ff Compare January 28, 2025 22:35
@troopa81 troopa81 merged commit d1c2651 into qgis:master Jan 29, 2025
31 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 c2782ffed81... Fix handling of multiple consecutive tabs with HTML text rendering
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 src/core/textrenderer/qgstextdocument.cpp
Auto-merging tests/src/python/test_qgstextrenderer.py
CONFLICT (content): Merge conflict in tests/src/python/test_qgstextrenderer.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_40 release-3_40
# Navigate to the new working tree
cd .worktrees/backport-release-3_40
# Create a new branch
git switch --create backport-60299-to-release-3_40
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c2782ffed81be3896360949b2a4fd0da5ac3f0ee
# Push it to GitHub
git push --set-upstream origin backport-60299-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-60299-to-release-3_40.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Jan 29, 2025
@nyalldawson nyalldawson deleted the fix_html_multiple_tabs branch February 4, 2025 02:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_40 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

4 participants