integration: tip clean prunes subsumed tips#1258
Open
ed-irl wants to merge 4 commits into
Open
Conversation
This was referenced Jun 12, 2026
Collaborator
Author
This was referenced Jun 12, 2026
Open
b49c605 to
84bfc7a
Compare
55fe46e to
f1d3ea6
Compare
84bfc7a to
40efc83
Compare
f1d3ea6 to
e59ef3a
Compare
When two configured tips lie on the same stack, merging the lower one into the integration branch produces no content that the higher tip's merge doesn't already produce. Keeping both wastes a merge per rebuild and inflates the resolver-prompt surface for no benefit. Add 'gs integration tip clean' (alias 'prune') that walks each tip's upstack looking for another configured tip. When one is found, the lower tip is subsumed: remove it and log which tip subsumes it. With 'low -> middle -> high' all configured, the prune cascades: 'low' is reported as subsumed by 'middle' (the nearest tip up the stack), and 'middle' as subsumed by 'high'. Both come out and only 'high' is left. A clean run with nothing to prune reports 'No subsumed tips to prune' instead of being silent. The new command is layered at the CLI: it reads tips via the existing Show, computes subsumption against the branch graph, and removes via RemoveTip. The integration handler interface stays unchanged.
f072c95 to
22b8904
Compare
74bddc1 to
115c647
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.
integration: tip clean prunes subsumed tips
When two configured tips lie on the same stack, merging the lower
one into the integration branch produces no content that the higher
tip's merge doesn't already produce. Keeping both wastes a merge
per rebuild and inflates the resolver-prompt surface for no benefit.
Add 'gs integration tip clean' (alias 'prune') that walks each tip's
upstack looking for another configured tip. When one is found, the
lower tip is subsumed: remove it and log which tip subsumes it.
With 'low -> middle -> high' all configured, the prune cascades:
'low' is reported as subsumed by 'middle' (the nearest tip up the
stack), and 'middle' as subsumed by 'high'. Both come out and only
'high' is left.
A clean run with nothing to prune reports 'No subsumed tips to
prune' instead of being silent.
The new command is layered at the CLI: it reads tips via the
existing Show, computes subsumption against the branch graph, and
removes via RemoveTip. The integration handler interface stays
unchanged.
integration-tip-clean: Regenerate derived files