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: incorrect gpkg table comment #59626

Merged

Conversation

hxbb00
Copy link
Contributor

@hxbb00 hxbb00 commented Nov 28, 2024

Description

get gpkg table comment postion incorrect

@github-actions github-actions bot added this to the 3.42.0 milestone Nov 28, 2024
Copy link

github-actions bot commented Nov 28, 2024

🪟 Windows builds

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

🪟 Windows Qt6 builds

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

@rouault
Copy link
Contributor

rouault commented Nov 28, 2024

A new test in tests/src/python/test_qgsproviderconnection_ogr_gpkg.py would be appreciated

@rouault rouault merged commit fbd05db into qgis:master Dec 2, 2024
39 checks passed
@qgis-bot
Copy link
Collaborator

qgis-bot commented Dec 2, 2024

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 6b0833378bd... add table comment test
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/providers/ogr/qgsgeopackageproviderconnection.cpp
[backport-59626-to-queued_ltr_backports bc70857f000] Fix: incorrect gpkg table comment
 Author: hxbb00 <[email protected]>
 Date: Thu Nov 28 16:25:46 2024 +0800
 1 file changed, 1 insertion(+), 1 deletion(-)
Auto-merging tests/src/python/test_qgsproviderconnection_ogr_gpkg.py
CONFLICT (content): Merge conflict in tests/src/python/test_qgsproviderconnection_ogr_gpkg.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-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-59626-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a2296916e5a8554c97b90b5a4889144b18f013fe,6b0833378bdea46f44e20bb09ced8042565f36af
# Push it to GitHub
git push --set-upstream origin backport-59626-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

Then, create a pull request where the base branch is queued_ltr_backports and the compare/head branch is backport-59626-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Dec 2, 2024
rouault pushed a commit to rouault/QGIS that referenced this pull request Dec 2, 2024
* Fix: incorrect gpkg table comment

* add table comment test
@rouault
Copy link
Contributor

rouault commented Dec 2, 2024

queued_ltr_backport in #59695

@rouault rouault removed the failed backport The automated backport attempt failed, needs a manual backport label Dec 2, 2024
nyalldawson pushed a commit that referenced this pull request Dec 2, 2024
* Fix: incorrect gpkg table comment

* add table comment test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants