From 79108a72a0dfd8f60bdd35d2cfde13eb25c4b15d Mon Sep 17 00:00:00 2001 From: jochen Date: Mon, 12 Oct 2026 17:29:59 +0200 Subject: [PATCH] Register R341: a check judged the head alone and let a merge that does not compile through Proved with replays/cmd/prove: TestReplay341 fails on the controller's main and passes on its fix (novox/hq ADR 0323, issue 341). --- replays/register.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/replays/register.go b/replays/register.go index d8d03b9..b49a139 100644 --- a/replays/register.go +++ b/replays/register.go @@ -378,6 +378,17 @@ var Register = []Replay{ Asserts: "a web server whose application never answers is said unhealthy by its declared HTTP check within two " + "looks, and the controller raises the module's condition on the second", Package: ".", Test: "TestReplaySilentWebApp", Files: []string{"cmd/mesh-controller/replays_test.go"}}, + // A merge check judged the head alone (2026-10-09): node-engine #66 was checked green at its head after #64/#65 + // had moved the trunk, both adding a field under the JSON key `declared`; git merged the two edits cleanly and the + // trunk no longer compiled. A test in the controller's builder, written with only what it had before the fix, run + // with a container runtime that runs each container's command on the machine. The fix is still on its branch: + // Fix is its pull request's head, proved against the main it branched from (novox/hq ADR 0323). + {ID: "R341", Issue: 341, Kind: InRepository, Repository: "mesh-controller", Fix: "83a9cf6", Before: "3cfc121", + What: "node-engine #66 passed both statuses at its head and merged; merged into the trunk #65 had moved, it did " + + "not compile: Declared redeclared", + Asserts: "a check judges the head merged into the trunk's head, and fails a head whose merge does not compile, " + + "saying so", + Package: "./internal/builder", Test: "TestReplay341", Files: []string{"internal/builder/replay341_test.go"}}, } // Find is the replay of that id, or of that issue. -- 2.54.0