From a65e1076a2e57b3d66cad5c4b657ae3ea2c67951 Mon Sep 17 00:00:00 2001 From: jochen Date: Fri, 16 Oct 2026 11:42:03 +0200 Subject: [PATCH] =?UTF-8?q?Design=2047:=20a=20pull=20request=20that=20no?= =?UTF-8?q?=20longer=20merges=20cleanly=20is=20told,=20not=20checked=20(AD?= =?UTF-8?q?R=200395=20=C2=A72)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 03-DESIGN/01-to-be/47-delivery-from-commit-to-delivered.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/03-DESIGN/01-to-be/47-delivery-from-commit-to-delivered.md b/03-DESIGN/01-to-be/47-delivery-from-commit-to-delivered.md index 4a17493d..b64a829d 100644 --- a/03-DESIGN/01-to-be/47-delivery-from-commit-to-delivered.md +++ b/03-DESIGN/01-to-be/47-delivery-from-commit-to-delivered.md @@ -395,7 +395,9 @@ them. *ADR 0395, changing ADR 0323 ยง4.* When the forge's holder hears a repository's trunk move, mesh-delivery asks the check of every active open pull request into that trunk against its new head at once, so a verdict is current by -the time anyone looks. A pull request has at most one check at a time: a check against an older trunk commit, +the time anyone looks. A pull request whose head no longer merges cleanly into the new head is not checked: the +forge says so without a builder, its statuses fail naming the conflict, and it is told once on the pull request; +its author's next push asks its check. A pull request has at most one check at a time: a check against an older trunk commit, waiting or running, is dropped or ended when a newer one is asked for it, as a new head already ends its old head's check (issue 726). The build queue keeps delivery builds first; then checks of pull requests marked ready, then the rest, the most recently pushed first. A pull request with no push and no ready mark for 7 days is left out until a