Cite ADR 0659 where the gate reads no description; check-gates-merge words no longer wait for a review

Claude-Session: https://claude.ai/code/session_01NcbgfFfQ4Z9UE5jK32PmE5
2026-11-07 23:33:05 +01:00
parent 9698bcd934
commit 8b84ac7487
4 changed files with 4 additions and 4 deletions
@@ -527,7 +527,7 @@ func TestAPassingVerdictAsksTheApproveAndItsApproveMergesWithinSecondsOverARealB
 	b.checkPasses(t, rt, "fix/x", "a1a1a1a1a1a1", judgedPull{"novox/app", 7, head})

 	// The description holds no review line and nothing is waited for: the ask is written into the gate's bucket asks within
-	// seconds of the verdict, with no label, comment or mark written by anyone (the gate reads no description, ADR 0493 §6).
+	// seconds of the verdict, with no label, comment or mark written by anyone (the gate reads no description, ADR 0493 §6, ADR 0659).
 	edit := time.Now()
 	var key string
 	rt.until("the ask to be written", eventWithin, func() bool { key = onlyAsk(b); return key != "" })
@@ -118,7 +118,7 @@ func (*askedAgainError) Error() string {
 	return "the forge refused gitea_merge_pull_request: novox/app#7 is not merged: its verdict was judged against trunk aaaaaaaaaaaa, and main is now bbbbbbbbbbbb. The check of head cccccccccccc merged into trunk bbbbbbbbbbbb was asked; took 3s. Ask again at cccccccccccc once both statuses pass. Nothing was merged"
 }

-// The gate reads nothing from a pull request's description (novox/hq ADR 0493 §6): a pull request whose description
+// The gate reads nothing from a pull request's description (novox/hq ADR 0493 §6, ADR 0659, which ends ADR 0496): a pull request whose description
 // holds no review line, or one naming another head, is asked once its other waits are met, and the ask names no review.
 func TestAPullRequestIsAskedWhateverItsDescriptionSays(t *testing.T) {
 	for _, c := range []struct{ name, body string }{
@@ -31,7 +31,7 @@ import (
 //   - a check that failed merges nothing: it is said once on the pull request, and as a stalled line, which the
 //     gate says to the operator as a condition (conditions.go). So is a merge the tool refused for an hour.
 //
-// No part reads a pull request's description to gate anything (novox/hq ADR 0493 §6). What this owner does is kept on the
+// No part reads a pull request's description to gate anything (novox/hq ADR 0493 §6, ADR 0659). What this owner does is kept on the
 // delivery (Ready), said in its log, and the merge's transitions name the Approve as their warrant.

 // readyRefusedFor is how long the merge tool may refuse an approved head before it is said as stalled: none (issue 1115) —
@@ -102,7 +102,7 @@
    },
    "check-gates-merge": {
      "type": "boolean",
-      "description": "Whether mesh/check gates the merge. True (the default): the operator's Approve is asked, and a merge handed, only on a passing verdict judged against the trunk's head, and a trunk's move puts a verdict out of date (ADR 0447, ADR 0505 §4). False (the operator, 2026-10-25 22:56: \"run the check locally only, but not as a gate, it loses us too much time\"; developers run the unit and integration levels locally before a pull request): a pull request reviewed at its head is ready, and its Approve is asked once the check at its heads (a group: of all its heads together) has a verdict, a pass or a failure said in the ask, or after 60 minutes with none, said so (the operator, 2026-10-27 23:54: \"if you don't want me to approve it, don't send the approval request\"); an approved merge waits for no verdict; no merge is refused for a check judged on an older trunk; a later verdict is shown on the pull request and the delivery, and asks a pending Approve again in its words; a group still merges all its members in one pass. Set it false together with the gitea module's check-gates-merge, which lets its merge tool merge an approved head without a passing mesh/check.",
+      "description": "Whether mesh/check gates the merge. True (the default): the operator's Approve is asked, and a merge handed, only on a passing verdict judged against the trunk's head, and a trunk's move puts a verdict out of date (ADR 0447, ADR 0505 §4). False (the operator, 2026-10-25 22:56: \"run the check locally only, but not as a gate, it loses us too much time\"; developers run the unit and integration levels locally before a pull request): a ready pull request (no review line is waited for, ADR 0659) has its Approve is asked once the check at its heads (a group: of all its heads together) has a verdict, a pass or a failure said in the ask, or after 60 minutes with none, said so (the operator, 2026-10-27 23:54: \"if you don't want me to approve it, don't send the approval request\"); an approved merge waits for no verdict; no merge is refused for a check judged on an older trunk; a later verdict is shown on the pull request and the delivery, and asks a pending Approve again in its words; a group still merges all its members in one pass. Set it false together with the gitea module's check-gates-merge, which lets its merge tool merge an approved head without a passing mesh/check.",
      "trusted": false,
      "default": true
    }