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] Respect custom layer order for groups in GetMap #9878

Merged
merged 1 commit into from Apr 27, 2019

Conversation

@elpaso
Copy link
Contributor

commented Apr 26, 2019

Fixes #21917

@elpaso

This comment has been minimized.

Copy link
Contributor Author

commented Apr 26, 2019

@andreasneumann I'd appreciate if you could give a test run on this PR

@andreasneumann

This comment has been minimized.

Copy link
Member

commented Apr 26, 2019

Just tested. The rendering order looks fine now. Many thanks for the fix!

@elpaso elpaso merged commit 6fa5663 into qgis:master Apr 27, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@elpaso elpaso deleted the elpaso:bugfix-21917-server-root-layer-order branch Apr 27, 2019

@backporting

This comment has been minimized.

Copy link
Contributor

commented Apr 27, 2019

The backport to release-3_4 failed:

Commits ["956ed06f5222df208d1d37092916c9014c5cb419"] could not be cherry-picked on top of release-3_4

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport release-3_4
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 956ed06f5222df208d1d37092916c9014c5cb419
# Create a new branch with these backported commits.
git checkout -b backport-9878-to-release-3_4
# Push it to GitHub.
git push --set-upstream origin backport-9878-to-release-3_4
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

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

@backporting

This comment has been minimized.

Copy link
Contributor

commented Apr 27, 2019

The backport to release-3_6 failed:

Commits ["956ed06f5222df208d1d37092916c9014c5cb419"] could not be cherry-picked on top of release-3_6

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport release-3_6
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 956ed06f5222df208d1d37092916c9014c5cb419
# Create a new branch with these backported commits.
git checkout -b backport-9878-to-release-3_6
# Push it to GitHub.
git push --set-upstream origin backport-9878-to-release-3_6
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.