novox/mesh-controller
7
0
Fork 0
Code Issues Pull Requests 6 Releases Wiki Activity

Add the replay of issue 349: a merge acted on late superseded the merge after it (hq issue 349) #290

Merged
mesh-admin merged 2 commits from fix/349-replay into main 2026-10-13 03:54:10 +00:00
Conversation 3 Commits 2 Files Changed 2
+107
2 Commits
Author SHA1 Message Date
jochen 5740874ce3 Drive the replay of issue 349 to where main decides (review of #290)
mesh/merge-gate head 5740874ce3b9 merged into trunk 1c9bc9cf0041 — pass: the change touches no module of the mesh's graph
Details
mesh/repo-check head 5740874ce3b9 merged into trunk 1c9bc9cf0041 — pass: its merge-check.sh passed
Details
mesh/delivery delivered
Details
mesh/delivery-group group fix/349-replay delivered: every member is delivered
Details 
Since ADR 0276 the earlier merge waits in a queued batch with no modules, and the
replay skipped it, so its pass on main proved nothing. The replay now ends the
later merge's walk and has another repository's merge heard, which cuts the batch,
and fails on any plan of the two merges left standing with nothing planned.
 2026-10-13 05:42:52 +02:00
jochen bbf70fbda4 Add the replay of issue 349: a merge acted on late superseded the merge after it (hq issue 349) 
Two catalogue merges acted on in reverse order left the fixed module planned at
the commit without the fix. The replay uses only what the controller had before
Listed among the store tests, so a check without a database cannot pass its skip.
 2026-10-13 05:42:52 +02:00