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

[OGR provider] Make querySublayers() work with GTFS .zip datasets #59226

Merged
merged 1 commit into from
Oct 26, 2024

Conversation

rouault
Copy link
Contributor

@rouault rouault commented Oct 25, 2024

Fixes #59222

Added tests/testdata/ogr/gtfs_extract.zip comes from GDAL autotest suite.

Fixes qgis#59222

Added tests/testdata/ogr/gtfs_extract.zip comes from GDAL autotest
suite.
@rouault rouault added the backport queued_ltr_backports Queued Backports label Oct 25, 2024
@github-actions github-actions bot added this to the 3.42.0 milestone Oct 25, 2024
Copy link

github-actions bot commented Oct 25, 2024

🪟 Windows builds

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

🪟 Windows Qt6 builds

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

@nyalldawson nyalldawson merged commit d678827 into qgis:master Oct 26, 2024
39 checks passed
@qgis-bot
Copy link
Collaborator

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply bb65f61fa3b... [OGR provider] Make querySublayers() work with GTFS .zip datasets
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/qgsgdalutils.cpp
Auto-merging tests/src/python/test_provider_ogr.py
CONFLICT (content): Merge conflict in tests/src/python/test_provider_ogr.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-59226-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick bb65f61fa3b0fe6e46b8a4fce0bfdea146c0f6a9
# Push it to GitHub
git push --set-upstream origin backport-59226-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-59226-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Oct 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports 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.

Can't open GTFS dataset
4 participants