diff --git a/changelog.d/fixed-mergeable-unknown-keeps-refusal.md b/changelog.d/fixed-mergeable-unknown-keeps-refusal.md new file mode 100644 index 0000000000..9d4973b9b1 --- /dev/null +++ b/changelog.d/fixed-mergeable-unknown-keeps-refusal.md @@ -0,0 +1 @@ +- Stage labels: a pass where GitHub reports a PR's mergeable state as `unknown`, which it does while it recomputes the merge after the base moves, no longer changes the PR's stage. The contributor lane stops on `mergeable-unknown` before admission, review or CI, and an approved head read as "nothing left for the author" became a weak `stage/080-awaiting-merge-admission` for that pass: a PR waiting on a person's merge for `contributor-lane:no-linked-issue` went 090 → 080 → 090, an admitted PR at 095 or 100 dropped to 080, and a conflicting PR at 072 could take the trusted-author lane's 090 for a pass. `mergeable-unknown` is now no stage opinion, like the destination-merge guard (#16819), and another lane's weak opinion does not stand in for it; an owned opinion from another lane still applies. The pass also keeps the lane's merge-train verdict on the head instead of clearing it, so a person's merge stays out of the train. [projectbluefin/utah-packages#1222](https://github.com/projectbluefin/utah-packages/pull/1222) flipped 090 → 080 → 090 twice in one evening this way. diff --git a/src/docs/labels-and-control-signals/stage-labels.md b/src/docs/labels-and-control-signals/stage-labels.md index 5a2dd4d892..7316869517 100644 --- a/src/docs/labels-and-control-signals/stage-labels.md +++ b/src/docs/labels-and-control-signals/stage-labels.md @@ -420,7 +420,7 @@ used to admit the PR: | `label:needs-human`, `exempt-label`, `excluded-label:*`, `human-merge-path*`, `intent-*`, `contributor-lane:workflow-path` / `tests-removed` / `no-reviewer` / `review-off` (a verdict is required but the review swarm is off, so none will be requested) / `reporter-trust-hold`, `workflow-permission` (GitHub refused update-branch or the merge-forward with a 403 because the base changed `.github/workflows/` and the token the hive used lacks the workflows permission; no token the hive holds can push that update, so it is not sent to 070), `fork-workflow-update` (the same update-branch refusal on a fork head: the App is not installed on the fork, so no grant lets it push there), `linked-issue:hold:#N: