Repository navigation
fix: pending-merge cleanup holds refused checkouts instead of force-removing them - #16042
Merged
Merged
Conversation
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.
Summary
finishMergedReceiptno longer force-removes (git worktree unlock+branch -D) a receipt checkout the retirement service refused. Head, lock and branch changes now take the existingheldpath with the recovery task, leaving commits, files and locks untouched.retirePendingMergeCheckoutaccepts a PR merged at a descendant of the handed-off head (ancestor-of-delivered-head), so a clean checkout retires through the guarded service and a dirty one is held.Tests
cosMergeHandoff.test.js: each former direct-removal reason is held and the checkout stays on disk.heldCheckoutRecovery.test.js: contained-head clean retire / dirty hold.npm run pregatepassed.Local review
codex (gpt-6.1-terra): 1 round, clean, on head bff9128. Nothing remained.
Closes #16039