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] Fix conflict between layers using same OGR datasource … #43372

Merged
merged 1 commit into from
May 25, 2021

Conversation

rouault
Copy link
Contributor

@rouault rouault commented May 24, 2021

…and layer with subset strings (fixes #43361)

@rouault rouault added Bug Either a bug report, or a bug fix. Let's hope for the latter! backport release-3_16 labels May 24, 2021
@github-actions github-actions bot added this to the 3.20.0 milestone May 24, 2021
Copy link
Contributor

@nirvn nirvn left a comment

Choose a reason for hiding this comment

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

@rouault , I confirm this fixed the reported issue, thanks.

@nyalldawson nyalldawson merged commit cf49d25 into qgis:master May 25, 2021
@qgis-bot
Copy link
Collaborator

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 128

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-43372-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick fd2d8e50d8a4617b9518ec341f693ad576a4d92c
# Push it to GitHub
git push --set-upstream origin backport-43372-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-43372-to-queued_ltr_backports.

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 Bug Either a bug report, or a bug fix. Let's hope for the latter!
Projects
None yet
4 participants