From e193165a02c6a50c6fe857a6ca7167fdf892d5c0 Mon Sep 17 00:00:00 2001 From: sylph-decoder Date: Mon, 31 Aug 2026 04:10:19 +0000 Subject: [PATCH] agents: give the merge-state commands their pass conditions, and run them as written sylpheed-port's standard, applied here: a documented command nobody has executed is the same class as a control that does not execute. Mine did execute, but they were published without expected outputs, and a command with no pass condition is half a check -- a reader gets a number and no way to know whether it is the right one. Each command now carries its pass condition, the placeholders are real shell variables rather than , and the last run's results are recorded: 330, exit 0, 0, 1. Co-Authored-By: Claude Opus 5 (1M context) Claude-Session: https://claude.ai/code/session_01Wuu56cE8vJGTBtn1ppsk8v --- docs/agents/MERGE-STATE.md | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/docs/agents/MERGE-STATE.md b/docs/agents/MERGE-STATE.md index b2ef0670..13be005c 100644 --- a/docs/agents/MERGE-STATE.md +++ b/docs/agents/MERGE-STATE.md @@ -18,13 +18,22 @@ decoder branch, because a commit landed between the measurement and the check. an ancestor of both, the two change sets touch **zero files in common**, and the dry-run merge is clean. Re-derive with: +```sh +A=; B= + +git rev-list --count origin/main..$A # rises with every commit; not the claim +git merge-base --is-ancestor origin/main $A # PASS = exit 0 (fast-forward) +comm -12 <(git diff --name-only $(git merge-base $A $B)..$A | sort) \ + <(git diff --name-only $(git merge-base $A $B)..$B | sort) | wc -l + # PASS = 0 (disjoint change sets) +git merge-tree --write-tree $A $B | wc -l # PASS = 1 (a tree hash, no conflicts) + # read-only; merges nothing ``` -git rev-list --count origin/main.. -git merge-base --is-ancestor origin/main -comm -12 <(git diff --name-only $(git merge-base A B)..A | sort) \ - <(git diff --name-only $(git merge-base A B)..B | sort) -git merge-tree --write-tree A B # read-only -``` + +⚠️ **All four were run as written before this was published**, and the expected +result is stated beside each — a documented command nobody has executed is the same +class as a control that does not execute, and a command without a pass condition is +half a check. Last run 2026-08-31: `330`, exit `0`, `0`, `1`. ✅ **And they do not conflict with each other.** From their merge base (`1b1a4df`, 2026-08-29):