fix(update): handle inverted merge parent ordering in weave topology#127
Merged
fix(update): handle inverted merge parent ordering in weave topology#127
Conversation
Merge commits with inverted parent ordering (feature as 1st parent, main as 2nd) caused walk_first_parent_line to follow the feature branch back to root instead of staying on the integration line. This produced a rebase todo replaying the entire repo history, leading to conflicts. Fix walk_first_parent_line to detect which parent leads to the merge base (via graph_descendant_of) and swap if needed. Fix walk_branch_commits to use merge_base(tip, stop) as the actual stop point for branches forked before the merge base. Together, these changes correctly identify the feature branch commits as already upstream, drop them, and produce clean linear history. Co-Authored-By: Claude Opus 4.6 <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.
Merge commits with inverted parent ordering (feature as 1st parent,
main as 2nd) caused walk_first_parent_line to follow the feature branch
back to root instead of staying on the integration line. This produced a
rebase todo replaying the entire repo history, leading to conflicts.
Fix walk_first_parent_line to detect which parent leads to the merge
base (via graph_descendant_of) and swap if needed. Fix walk_branch_commits
to use merge_base(tip, stop) as the actual stop point for branches forked
before the merge base. Together, these changes correctly identify the
feature branch commits as already upstream, drop them, and produce clean
linear history.
Co-Authored-By: Claude Opus 4.6 noreply@anthropic.com