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

Fix some overlay algorithms output multipoint geometries but output layer is single point, causing insertion errors #50567

Merged
merged 1 commit into from
Oct 20, 2022

Conversation

nyalldawson
Copy link
Collaborator

Fixes #49456

Needs tests

@nyalldawson nyalldawson added the Requires Tests! Waiting on the submitter to add unit tests before eligible for merging label Oct 17, 2022
@github-actions github-actions bot added this to the 3.28.0 milestone Oct 17, 2022
output layer is single point, causing insertion errors

Fixes qgis#49456
@nyalldawson nyalldawson removed the Requires Tests! Waiting on the submitter to add unit tests before eligible for merging label Oct 17, 2022
@nyalldawson nyalldawson merged commit c9a2a5e into qgis:master Oct 20, 2022
@nyalldawson nyalldawson deleted the fix_49456 branch October 20, 2022 03:59
@agiudiceandrea
Copy link
Contributor

@nyalldawson, since the bug is a regression introduced also in QGIS 3.22, shouldn't this PR be backported to the release-3_22 branch?

@nyalldawson
Copy link
Collaborator Author

@agiudiceandrea

Sorry, I didn't realise 3.22 was affected also

@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 5fc7320fea... Fix some overlay algorithms output multipoint geometries but
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/analysis/processing/qgsalgorithmdifference.cpp
CONFLICT (content): Merge conflict in src/analysis/processing/qgsalgorithmdifference.cpp
Auto-merging src/analysis/processing/qgsalgorithmfixgeometries.cpp
Auto-merging src/analysis/processing/qgsalgorithmsymmetricaldifference.cpp
CONFLICT (content): Merge conflict in src/analysis/processing/qgsalgorithmsymmetricaldifference.cpp
Auto-merging src/analysis/processing/qgsoverlayutils.cpp
CONFLICT (content): Merge conflict in src/analysis/processing/qgsoverlayutils.cpp
Auto-merging src/analysis/processing/qgsoverlayutils.h
CONFLICT (content): Merge conflict in src/analysis/processing/qgsoverlayutils.h

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-50567-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 5fc7320fea9c2f04d6dc5bdea0063218e33bce3f
# Push it to GitHub
git push --set-upstream origin backport-50567-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-50567-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 failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Native CLIP function
4 participants