gitea: the merge tool reads a carried verdict's line as judged on the new trunk, so it merges a carried verdict (ADR 0548 §8; issue 568, review round 1)

2026-10-26 12:15:20 +01:00
parent 7627503d9d
commit b94150fcdb
1 changed files with 3 additions and 0 deletions
@@ -34,6 +34,9 @@ test("both statuses say the head and the trunk commit the verdict judged, first,
  const [old] = statusesFor({ ...c, trunk: undefined, gate: { verdict: "pass", summary: "every machine composes" } });
  assert.equal(old.description, "pass: every machine composes");
  assert.equal(trunkNamed(old.description), undefined);
+  // ADR 0548 §8: a carried verdict's line names the head on the new trunk first, so the merge tool merges it on that trunk.
+  assert.equal(trunkNamed(`pass ${HEAD.slice(0, 12)} on ${MOVED.slice(0, 12)} | carried from ${TRUNK.slice(0, 12)}, mesh-catalog 0123456789ab | unit 0 run, 4 kept`),
+    MOVED.slice(0, 12));
 });

 test("a trunk's move puts an open head's merge check out of date, naming both commits, unless a check is on its way", () => {