diff --git a/changelog.d/fixed-merge-guard-stage-flap.md b/changelog.d/fixed-merge-guard-stage-flap.md new file mode 100644 index 0000000000..58be9c1b12 --- /dev/null +++ b/changelog.d/fixed-merge-guard-stage-flap.md @@ -0,0 +1 @@ +- A PR parked at 085 on a red check no longer flips to 080 whenever a contributor-lane pass is refused the destination-merge lock. The lane reports that refusal (`base-refresh:merge-guard`, "destination merge already in progress") together with its error, and the classifier's errored-lane branch ran first: an approved head read as a weak 080, which replaced the standing 085 and seated the red PR at the front of a merge train until the next evaluated pass put it back (projectbluefin/utah-packages#917, about 15 round trips on one head). The refusal is now no stage opinion, error or not. diff --git a/src/docs/adr/0025-central-stage-engine.md b/src/docs/adr/0025-central-stage-engine.md index 4e55ca7623..b2fc7466b2 100644 --- a/src/docs/adr/0025-central-stage-engine.md +++ b/src/docs/adr/0025-central-stage-engine.md @@ -55,11 +55,11 @@ hub read that store and nothing else (`stageStoreOrShared`, (`src/pkg/github/automerge/automerge_stage_labels.go:365`), observations are sorted by `stageLanePrecedence` (self 3 > trusted 2 > contributor 1, `src/pkg/github/automerge/automerge_stage_labels.go:177`), each is classified - by `ClassifyStage` (`src/pkg/stageengine/derive_pr_classify.go:261`) + by `ClassifyStage` (`src/pkg/stageengine/derive_pr_classify.go:342`) into a ranked opinion (`prstage.RankNone..prstage.RankOwned`, `src/pkg/stageengine/prstage/types.go:145-148`), and `ResolveStage` picks the winner - (`src/pkg/stageengine/derive_pr_classify.go:454`). These PR helpers now + (`src/pkg/stageengine/derive_pr_classify.go:718`). These PR helpers now live in the engine (#13779); automerge keeps only gathering-side previews. Shared concepts — parking (045/085, `needs-human`, hold labels), author kind (070/071/072), adoption (074), terminal states, `origin/*` — are modelled twice with diff --git a/src/docs/labels-and-control-signals/stage-labels.md b/src/docs/labels-and-control-signals/stage-labels.md index c12b841d9e..71cb59f359 100644 --- a/src/docs/labels-and-control-signals/stage-labels.md +++ b/src/docs/labels-and-control-signals/stage-labels.md @@ -398,7 +398,7 @@ used to admit the PR: | `label:hold`, `held`, `label:needs-human`, `exempt-label`, `excluded-label:*`, `sentinel`, `human-merge-path*`, `intent-*`, `contributor-lane:workflow-path` / `tests-removed` / `no-reviewer` / `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: