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

[WFS provider] Add "bbox" and "sql" to list of known URI parameters #53247

Merged
merged 1 commit into from
May 27, 2023

Conversation

pathmapper
Copy link
Contributor

@pathmapper pathmapper commented May 26, 2023

To avoid emiting a warning message if they are used, indicating they are unknown parameters.

Before this PR such messages were emitted:
grafik

@github-actions github-actions bot added this to the 3.32.0 milestone May 26, 2023
@rouault rouault added the backport queued_ltr_backports Queued Backports label May 27, 2023
@rouault rouault merged commit 06fde96 into qgis:master May 27, 2023
@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 c498f18e3f... [WFS provider] Add "bbox" and "sql" to list of known URI parameters
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".

stdout
Auto-merging src/providers/wfs/qgswfsconstants.cpp
CONFLICT (content): Merge conflict in src/providers/wfs/qgswfsconstants.cpp
Auto-merging src/providers/wfs/qgswfsconstants.h
CONFLICT (content): Merge conflict in src/providers/wfs/qgswfsconstants.h
Auto-merging src/providers/wfs/qgswfsdatasourceuri.cpp
CONFLICT (content): Merge conflict in src/providers/wfs/qgswfsdatasourceuri.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-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-53247-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c498f18e3f26af4e512fbb3fc5c8e23e2a13ccad
# Push it to GitHub
git push --set-upstream origin backport-53247-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-53247-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label May 27, 2023
@rouault
Copy link
Contributor

rouault commented May 27, 2023

backport in #53250

@rouault rouault removed the failed backport The automated backport attempt failed, needs a manual backport label May 27, 2023
@pathmapper pathmapper deleted the wfs_param_warning branch May 27, 2023 10:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants