NEC-354: The merge queue leaves a card Blocked after main is re-run green, and blocks it again if moved back #325
No reviewers
Labels
No labels
area:docs
area:identity
area:ops
area:plugin
area:server
channel:community
channel:direct
channel:owned
channel:press
channel:social
dependencies
e2ee-constrained
gate:at-ga
gate:pre-ga
marketing
parity
relay:absent
relay:planned
relay:requested
relay:supported
risk:additive
risk:contract
risk:none
security
usability
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set
Reference
Nectenda/nectenda!325
Loading…
Reference in a new issue
No description provided.
Delete branch "worktree-nec-354-the-merge-queue-leaves-a-card-blocked-af"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Task: NEC-354 — https://projectron.nerchure.com/tasks/375
When main's run failed after a merge, the merge queue paused and blocked the card, but on resuming it only cleared the pause: the card, its ride-alongs and its worktree were left for a person, and moving the card back to Merging blocked it again because its pull request had merged. Now the queue finishes the paused card like any landing once main's green head contains its commit, wording honestly whether its own run passed on a re-run or main is green on a later commit; and a card in Merging whose newest pull request already merged is judged by main's run on that merge. Four review rounds hardened what finishing may delete: only from Blocked, Merging or Done, never with an open pull request, never through an older merged pull request, never when a merged pull request reverts it or its Forgejo branch has commits main lacks, and a local branch only at a tip that landed (tested against a throwaway repository). Rides along NEC-357: the queue's plain rebase silently dropped whatever a merge commit held, so a branch with merges main lacks is now blocked for a person instead of being rebased or bounced. Spec: docs/changes/NEC-354-merge-queue-finishes-paused-cards/spec.md.
Spec:
docs/changes/NEC-354-merge-queue-finishes-paused-cards/spec.mdAlso fixes NEC-357: The merge queue's rebase silently drops what a merge commit holds
Changelog
NONE