feat(merge-tool): Get full history of merged entities #431
Conversation
This file contains 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
Including previously merged entities that point to a merged entity
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 shortcomings of PR #430.
The issue was that previously merged entities do not point to newly merged entity BBID.
For example, if entity A was merged into entity B, BBID A will point to BBID B.
Now if entity B is merged in entity C, BBID B will point to BBID C.
To allow for reverting merges cleanly, BBID A still points to B and not C (this allows us to revet the merge of B -> C while keeping the merge A-> B).
In order to fetch the complete history tree containing all three entities, we need to recursively check if a source_bbid appears as a target_bbid in other rows.