Trial P-66, a queued pull request: once the base it waits on moves into conflict with it, the queue takes it out unmerged (#812)
Merged
DO
4d ago+892+892+012345678901234567890123456789-1-1-0123456789
Part of #812 (trial P-66). This PR records the trial's second case, a base that moves while a pull request is queued. Its first case, an enqueue in conflict, is the companion pull request with trials/P-66.json. The section 6 row added here names both fixtures, so the two land back to back.
The trial
Question, as posted on #812 before the run: does the merge queue drop a queued pull request when its base moves into conflict with it, and what does that leave on its timeline, in mergeable, mergeStateStatus and the queue's entry?
Verdict: pass.
- Setup. Canary pull requests C (116) and D (117) each add
p66/two.mdwith different words. Both were enqueued at once: C at 12:56:16Z in position 1, D at 12:56:18Z in position 2. - What the queue did. The queue builds one entry at a time (
maximumEntriesToBuild1), so only C's merge group ran. D readMERGEABLE/CLEANandQUEUEDuntil C merged at 13:01:15Z. - D's removal. At 13:01:16Z D's timeline gained a
RemovedFromMergeQueueEventwith reasonmerge_conflict, actorgithub-merge-queueandbeforeCommitnull. No merge group was ever built for D. D then readCONFLICTING/DIRTYwith no entry, and canarymainnever held its change. REST gives the removal asremoved_from_merge_queuewith no reason. - Approvals. The Maintainer made the four approvals on canary 114ā117 by hand, in the browser, as the machine user donpetry-bot. The
machine-user-approvesworkflow did not make them. - PR 120. Canary pull request 120, which belongs to another trial, ran its own merge group from 13:11Z to 13:15Z, after this case ended. It had no bearing on it.
- Not asked: a queue that builds a group on another's, and an enqueue made while the head still reads
UNKNOWNor a staleMERGEABLE.
Grounding. sim/grounding.py names this fixture in a later pull request, together with P-67's, once the protected edit is ruled.
What was removed and what was undone
- Captures and redaction. Every exchange was captured with
gh api --includeinto a scratch directory outside the repo and redacted withtools.redact_trialbefore anyone read it. The fixture keeps thedateheader alone, and running the redaction over the drafted fixture removed nothing more. - The extra read. One read was made after the run: a read-only GraphQL read of the node ids, at 13:31:46Z.
tools/check_trials.pyneeds that answer for each enqueue, and the fixture marks it as made after the run. - Undone in the canary:
- 115 and 117 were closed unmerged.
- Branches
p66-atop66-dwere deleted.
- Kept in the canary:
- Issues 118 and 119 stay closed; trial P-67 closed them.
p66/one.mdandp66/two.mdstay on canarymainas harmless text.
Second readers
| Reader | Head | Result |
|---|---|---|
| Carbon | b3dfdb67 | not run (quota), owed |
| Muse | b3dfdb67 | not run (quota: the window resets 2026-11-16), owed |
| Astra | b3dfdb67 | no findings |
| Claude + security | b3dfdb67 | one minor: the row claimed more than the run showed. Narrowed in 241189ce, which is b3dfdb67 rebased onto the newer main with only the row changed |
Checks
make checkspasses.tools.check_trialsandtests.test_tools.Trialspass.
š¤ Generated with Claude Code