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

server: include xml processing instruction in feature info and server exception responses #50908

Merged
merged 1 commit into from
Nov 17, 2022

Conversation

jef-n
Copy link
Member

@jef-n jef-n commented Nov 16, 2022

No description provided.

@github-actions github-actions bot added this to the 3.30.0 milestone Nov 16, 2022
@jef-n jef-n requested a review from elpaso November 16, 2022 20:51
@jef-n jef-n self-assigned this Nov 17, 2022
Copy link
Contributor

@elpaso elpaso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you.

@jef-n jef-n enabled auto-merge (squash) November 17, 2022 09:25
@Gustry Gustry added the Server Related to QGIS server label Nov 17, 2022
@jef-n jef-n merged commit 3c6e0cf into qgis:master Nov 17, 2022
@qgis-bot
Copy link
Collaborator

The backport to release-3_22 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c453b1fb54... server: include xml processing instruction in feature info and server exceptions responses
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/server/services/wms/qgswmsrenderer.cpp
Auto-merging tests/src/python/test_qgsserver.py
Auto-merging tests/src/python/test_qgsserver_wms_getfeatureinfo.py
Auto-merging tests/src/python/test_qgsserver_wms_getmap.py
CONFLICT (content): Merge conflict in tests/src/python/test_qgsserver_wms_getmap.py
Auto-merging tests/src/python/test_qgsserver_wms_getmap_size_server.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_22 release-3_22
# Navigate to the new working tree
cd .worktrees/backport-release-3_22
# Create a new branch
git switch --create backport-50908-to-release-3_22
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c453b1fb54876c3b9aada4b3538b33607daac62a
# Push it to GitHub
git push --set-upstream origin backport-50908-to-release-3_22
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_22

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Nov 17, 2022
jef-n added a commit to jef-n/QGIS that referenced this pull request Nov 17, 2022
@jef-n jef-n deleted the fix-wms-featureinfo branch November 17, 2022 19:51
jef-n added a commit that referenced this pull request Nov 19, 2022
… exceptions responses (#50908) (#50922)

(cherry picked from commit 3c6e0cf)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
failed backport The automated backport attempt failed, needs a manual backport Server Related to QGIS server
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants