Repository navigation
merge: Preserve native stacks behind trunk - #1492
Merged
Merged
Conversation
An internally aligned native stack can merge after trunk advances. Preparing its trunk-based bottom instead rebases that branch and forces every member above it to restack and resubmit before merging. Keep the preflight head for a member originally based on trunk, matching individual merge preparation. Continue preparing other members, including range bottoms whose bases were merged by earlier queue items. Allow the same case in ShamHub by separating the current target head from the bottom change's merge base. Apply the stack's delta from that merge base onto the current target so merge and squash operations preserve independent trunk changes. Keep the target head as the publication parent and CAS expectation.
Owner
Author
|
This change is part of the following stack:
Change managed by git-spice. |
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.
An internally aligned native stack can merge after trunk advances.
Preparing its trunk-based bottom instead rebases that branch and
forces every member above it to restack and resubmit before merging.
Keep the preflight head for a member originally based on trunk,
matching individual merge preparation.
Continue preparing other members, including range bottoms whose bases
were merged by earlier queue items.
Allow the same case in ShamHub by separating the current target head
from the bottom change's merge base.
Apply the stack's delta from that merge base onto the current target
so merge and squash operations preserve independent trunk changes.
Keep the target head as the publication parent and CAS expectation.
[skip changelog]: Fixes unreleased native stack merging.