fix #5340: before merging gather only xrefs of changes with status pending on originating tree#5342
Open
BertKoor wants to merge 1 commit into
Open
Conversation
…h status pending on originating tree
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #5342 +/- ##
============================================
- Coverage 35.37% 35.37% -0.01%
Complexity 11196 11196
============================================
Files 1166 1166
Lines 48031 48032 +1
============================================
Hits 16990 16990
- Misses 31041 31042 +1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes #5340
XREFs of changes with status accepted or rejected in the originating tree should not be queried for prior to a tree merge.
The merge itself does nothing with pending changes in the originating tree.
XREFs of pending changes could be useful to gather though. If these overlap, then the merge will ask to first execute renumbering this tree. Then renumbering won't execute while there are still pending changes:
https://github.com/fisharebest/webtrees/blob/main/app/Http/RequestHandlers/RenumberTreeAction.php#L59-L68
With all changes being accepted or rejected, renumbering will take care of any colliding XREFs and there should be no issue with merging.