Skip to content

Comments

Issue 4630#4631

Merged
hobu merged 3 commits intoPDAL:masterfrom
blenderfan:issue-4630
Jan 24, 2025
Merged

Issue 4630#4631
hobu merged 3 commits intoPDAL:masterfrom
blenderfan:issue-4630

Conversation

@blenderfan
Copy link
Contributor

Fixes #4630.

@hobu hobu added this to the 2.8.4 milestone Jan 24, 2025
@hobu hobu merged commit 6a8195e into PDAL:master Jan 24, 2025
12 checks passed
@hobu hobu modified the milestones: 2.8.4, 2.9.0 Jan 24, 2025
@hobu hobu added the bug label Jan 24, 2025
@hobu
Copy link
Member

hobu commented Jan 24, 2025

The backport to 2.8-maintenance failed:

The process '/usr/bin/git' failed with exit code 1
stderr
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

stdout
[backport-4631-to-2.8-maintenance fd56bc4fe] fixing nodes being deleted when the poisson filter is executed twice
 Author: blenderfan <[email protected]>
 Date: Fri Jan 24 12:50:53 2025 +0100
 2 files changed, 2 insertions(+), 1 deletion(-)
On branch backport-4631-to-2.8-maintenance
You are currently cherry-picking commit 085cc5658.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

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-2.8-maintenance 2.8-maintenance
# Navigate to the new working tree
cd .worktrees/backport-2.8-maintenance
# Create a new branch
git switch --create backport-4631-to-2.8-maintenance
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 46d35d8f6e39af683fc000b4b58d7eac85adf34c,085cc565862debee454856405f907fd1bbdef481,41f00b0753ba5d5644e3a9c08d15e528490ba64c
# Push it to GitHub
git push --set-upstream origin backport-4631-to-2.8-maintenance
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.8-maintenance

Then, create a pull request where the base branch is 2.8-maintenance and the compare/head branch is backport-4631-to-2.8-maintenance.

hobu pushed a commit that referenced this pull request Jan 24, 2025
* fixing nodes being deleted when the poisson filter is executed twice

* Fixing nodes being deleted when the poisson filter is executed twice

A global flag was set that caused the initial nodes of an octree
used by PoissonRecon to deleted when a PoissonFilter was
executed twice, causing crashes.
@hobu
Copy link
Member

hobu commented Jan 24, 2025

picked back to 2.8-maintenance at 16f2804

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Poisson Filter cannot be run twice

2 participants