Skip to content

fix: close out a landed stack parent without waiting on children that never merged into it - #437

Merged
danielhanold merged 7 commits into
mainfrom
fix/parent-closeout-waits-on-a-retargeted-child-so-a-parent-that
Oct 20, 2026
Merged

danielhanold merged 7 commits into
mainfrom
fix/parent-closeout-waits-on-a-retargeted-child-so-a-parent-that

Conversation

@danielhanold

@danielhanold danielhanold commented Oct 20, 2026 •

Copy link
Copy Markdown
Owner

↩ Change 0571 — Close out a landed stack parent without waiting on children that never merged into it

A stack parent that has landed on main now closes out to done without waiting on children that never merged into it. Its closeout takes to done exactly the children whose PRs merged into its branch (stacked-merged, or implemented with 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's children-retarget-required disposition is retired; cleanup's disposition of the same name is unchanged. TestE2EStackParentLandedFirst uses the real parent closeout. Decision recorded as ADR-0156.

Review

Tier: deep (docket-review-deep).

# Severity Finding Disposition
1 minor Subtest open-pr-not-carried modeled a not-merged PR and did not check that GitHub was asked about the child fixed in 7c4f0dc: renamed to not-merged-pr-not-carried, now asserts exactly one probe

@danielhanold
danielhanold merged commit 8a881ea into main Oct 20, 2026
7 checks passed
@danielhanold
danielhanold deleted the fix/parent-closeout-waits-on-a-retargeted-child-so-a-parent-that branch October 20, 2026 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant