Octopus merges - #132
Merged
Merged
Conversation
These are the rare nodes that have at least 3 parents. Prior to this commit, attempting to build a volgo graph for repos containing such octopus nodes would triggers errors, now this is a supported use case.
Extend the octopus merge test to verify that graph traversal functions correctly handle nodes with more than 2 parents. This covers leaves computation, ancestor checking, and descendance relations. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Extend the octopus merge test graph with two child commits to verify that greatest_common_ancestors correctly handles octopus merges. Tests cover scenarios where the octopus merge is the GCA result and where ancestry is computed through the octopus merge. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
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
1 participant
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.
Add support for octopus merges in vcs (Merge nodes with 3+ parents).