Repository navigation
fix: close out a landed stack parent without waiting on children that never merged into it - #437
Merged
danielhanold merged 7 commits intoOct 20, 2026
Conversation
…hildren that never merged into it
… that never merged into it
… merged into the parent
danielhanold
deleted the
fix/parent-closeout-waits-on-a-retargeted-child-so-a-parent-that
branch
October 20, 2026 09:40
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.
A stack parent that has landed on main now closes out to
donewithout waiting on children that never merged into it. Its closeout takes todoneexactly the children whose PRs merged into its branch (stacked-merged, orimplementedwith the PR merged into the parent's branch). Each child's work must first be proven on main. Retargeted, unbuilt, killed, or already-landed children no longer block the parent. Rebase, publish, merge, and closeout now share one carry rule (DeriveCarriedSet). Closeout'schildren-retarget-requireddisposition is retired; cleanup's disposition of the same name is unchanged.TestE2EStackParentLandedFirstuses the real parent closeout. Decision recorded as ADR-0156.Review
Tier: deep (
docket-review-deep).open-pr-not-carriedmodeled a not-merged PR and did not check that GitHub was asked about the childnot-merged-pr-not-carried, now asserts exactly one probe