Skip to content

SQL editor: clear -> undo#63621

Merged
nyalldawson merged 2 commits into
qgis:masterfrom
elpaso:bugfix-unreported.sqlwidget-clear-undo
Oct 22, 2025
Merged

SQL editor: clear -> undo#63621
nyalldawson merged 2 commits into
qgis:masterfrom
elpaso:bugfix-unreported.sqlwidget-clear-undo

Conversation

@elpaso

@elpaso elpaso commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

Allow undo after clear.

@elpaso elpaso added the Bug Either a bug report, or a bug fix. Let's hope for the latter! label Oct 20, 2025
@github-actions github-actions Bot added this to the 4.0.0 milestone Oct 20, 2025
@elpaso

elpaso commented Oct 20, 2025

Copy link
Copy Markdown
Contributor Author
@github-actions

github-actions Bot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

🪟 Windows Qt6 builds

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

🍎 MacOS Qt6 builds

Download MacOS Qt6 builds of this PR for testing.
This installer is not signed, control+click > open the app to avoid the warning
(Built from commit ec501a5)

@raymondnijssen

Copy link
Copy Markdown
Contributor

Just compiled and tested and it works like a charm. Thank you so much!!!

Comment thread src/gui/qgsqueryresultwidget.cpp
@nyalldawson nyalldawson reopened this Oct 22, 2025
@nyalldawson nyalldawson merged commit b19ed40 into qgis:master Oct 22, 2025
73 of 76 checks passed
@qgis-bot

Copy link
Copy Markdown
Collaborator

The backport to release-3_40 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 32946552e35... SQL editor: clear -> undo
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/gui/qgsqueryresultwidget.cpp
CONFLICT (content): Merge conflict in src/gui/qgsqueryresultwidget.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_40 release-3_40
# Navigate to the new working tree
cd .worktrees/backport-release-3_40
# Create a new branch
git switch --create backport-63621-to-release-3_40
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 32946552e355d859ed289cf4d863ec420a3c0a15,ec501a5699fd37698f17d3b04cd7949b2870f1f2
# Push it to GitHub
git push --set-upstream origin backport-63621-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-63621-to-release-3_40.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Oct 22, 2025
@qgis-bot

Copy link
Copy Markdown
Collaborator

The backport to release-3_44 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 32946552e35... SQL editor: clear -> undo
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/gui/qgsqueryresultwidget.cpp
CONFLICT (content): Merge conflict in src/gui/qgsqueryresultwidget.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_44 release-3_44
# Navigate to the new working tree
cd .worktrees/backport-release-3_44
# Create a new branch
git switch --create backport-63621-to-release-3_44
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 32946552e355d859ed289cf4d863ec420a3c0a15,ec501a5699fd37698f17d3b04cd7949b2870f1f2
# Push it to GitHub
git push --set-upstream origin backport-63621-to-release-3_44
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_44

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport release-3_44 Bug Either a bug report, or a bug fix. Let's hope for the latter! failed backport The automated backport attempt failed, needs a manual backport

4 participants