integration: tip advance moves tips to upstack leaves#1259
Open
ed-irl wants to merge 3 commits into
Open
Conversation
This was referenced Jun 12, 2026
Collaborator
Author
This was referenced Jun 12, 2026
Open
55fe46e to
f1d3ea6
Compare
a1f8426 to
8a31e8a
Compare
f1d3ea6 to
e59ef3a
Compare
8a31e8a to
cc895aa
Compare
Extending a stack above a configured tip leaves the tip "behind" —
the integration branch keeps merging the old tip and ignores the new
top of the stack. The workaround so far has been 'tip remove old'
plus 'tip add new', which gets tedious when several tips drift
together.
Add 'gs integration tip advance' that walks the upstack tree of each
configured tip via graph.Tops, swaps the tip for its leaves, and
dedups across tips. Linear case ('low -> middle -> high' with tip
'low') collapses to a single replacement: 'low' becomes 'high'.
Forked case ('base -> {fork-a, fork-b}' with tip 'base') expands to
both leaves. Already-at-the-top tips are left alone with no log
spam. An empty advance reports "No tips to advance".
The optional positional argument scopes the operation to a subset of
configured tips, so 'tip advance fork-a' walks only that tip.
Unrecognized names abort before any mutation so we never leave the
tip list half-updated.
74bddc1 to
115c647
Compare
f365ec5 to
3e7d04a
Compare
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.
Extending a stack above a configured tip leaves the tip "behind" —
the integration branch keeps merging the old tip and ignores the new
top of the stack. The workaround so far has been 'tip remove old'
plus 'tip add new', which gets tedious when several tips drift
together.
Add 'gs integration tip advance' that walks the upstack tree of each
configured tip via graph.Tops, swaps the tip for its leaves, and
dedups across tips. Linear case ('low -> middle -> high' with tip
'low') collapses to a single replacement: 'low' becomes 'high'.
Forked case ('base -> {fork-a, fork-b}' with tip 'base') expands to
both leaves. Already-at-the-top tips are left alone with no log
spam. An empty advance reports "No tips to advance".
The optional positional argument scopes the operation to a subset of
configured tips, so 'tip advance fork-a' walks only that tip.
Unrecognized names abort before any mutation so we never leave the
tip list half-updated.