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

Missing expression scope in batch processing expression builder (alternative) #56411

Merged
merged 4 commits into from Feb 20, 2024

Conversation

nyalldawson
Copy link
Collaborator

Alternate fix to #56132

Copy link

github-actions bot commented Feb 20, 2024

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit a3d2fb4)

Copy link
Contributor

@alexbruy alexbruy left a comment

Choose a reason for hiding this comment

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

Looks good to me

Co-authored-by: Nicolas Godet <39594821+nicogodet@users.noreply.github.com>
@nyalldawson nyalldawson merged commit f1d762e into qgis:master Feb 20, 2024
29 checks passed
@nyalldawson nyalldawson deleted the fix_56132 branch February 20, 2024 22:12
@qgis-bot
Copy link
Collaborator

The backport to release-3_34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 2ab9e350f8a... Cleanup code, only run checks when warnOnInvalid is True
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 python/plugins/processing/gui/BatchPanel.py
CONFLICT (content): Merge conflict in python/plugins/processing/gui/BatchPanel.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_34 release-3_34
# Navigate to the new working tree
cd .worktrees/backport-release-3_34
# Create a new branch
git switch --create backport-56411-to-release-3_34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 2ab9e350f8af615502c41165fe13308200652410,60b363518cfee3cd3ec9acf7a8a4d33de4ad4253,af4da9dcff6ae6b83f8cce7e78a7345096946162,a3d2fb409d7b086f7b504815a67a8f4ab3e9ae8a
# Push it to GitHub
git push --set-upstream origin backport-56411-to-release-3_34
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_34

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Feb 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_34 failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants