To-be 47, to-be 45 §9 and the glossary take ADR 0323: a merge check judges the merge (issue 341) #332

Merged
mesh-admin merged 2 commits from feat/341-a-merge-check-judges-the-merge into main 2026-10-12 16:11:27 +00:00
Contributor

This gives novox/hq ADR 0323 its home. The decision is accepted and was approved by the operator today.

  • To-be 47, The state table: proposed is bounded from when its check is asked, and has no bound while its verdict is out of date and nothing is asked. A new paragraph says that a verdict holds for one trunk commit: ready goes back to proposed on trunk moved, rejected stays rejected, and the guard of proposed → checked counts only a verdict naming the trunk's head, so the table reaches a fixed point. It names the test that holds this.
  • To-be 47, A delivery group, its Check bullet: each member's head is merged into its own trunk's head and named with that commit. A rebased or pushed member takes its old head's place and is composed again instead of the group being held. A merge into a member's trunk by a pull request that is not a member puts the composed check out of date, and the group reads checking. It names the tests.
  • To-be 45 §9: a dated "Revision, ADR 0323" paragraph says what the gate judges, what the verdict names, the trunk-move reset, and the merge tool's refusal and ask. It names the replay R341 and the tests.
  • Glossary: the merge check entry says it judges the merge of the head into a named trunk commit. trunk commit is added, as the record proposes. ADR 0323 is added to Change and delivery's "Decided by".

merge-check.sh passes, with MESH_CATALOG_DIR set: records, index, cycle and words, 154 head words each once.

The code is in mesh-controller, mesh-catalog and mesh-lab on the same branch name, under issue 341.

This gives novox/hq ADR 0323 its home. The decision is accepted and was approved by the operator today. - **To-be 47, The state table**: `proposed` is bounded from when its check is asked, and has no bound while its verdict is out of date and nothing is asked. A new paragraph says that a verdict holds for one trunk commit: `ready` goes back to `proposed` on `trunk moved`, `rejected` stays `rejected`, and the guard of `proposed` → `checked` counts only a verdict naming the trunk's head, so the table reaches a fixed point. It names the test that holds this. - **To-be 47, A delivery group, its Check bullet**: each member's head is merged into its own trunk's head and named with that commit. A rebased or pushed member takes its old head's place and is composed again instead of the group being held. A merge into a member's trunk by a pull request that is not a member puts the composed check out of date, and the group reads `checking`. It names the tests. - **To-be 45 §9**: a dated "Revision, ADR 0323" paragraph says what the gate judges, what the verdict names, the trunk-move reset, and the merge tool's refusal and ask. It names the replay R341 and the tests. - **Glossary**: the **merge check** entry says it judges the merge of the head into a named trunk commit. **trunk commit** is added, as the record proposes. ADR 0323 is added to Change and delivery's "Decided by". `merge-check.sh` passes, with `MESH_CATALOG_DIR` set: records, index, cycle and words, 154 head words each once. The code is in mesh-controller, mesh-catalog and mesh-lab on the same branch name, under issue 341.
mesh-admin added 1 commit 2026-10-12 15:31:03 +00:00
Give ADR 0323 its place in to-be 47, to-be 45 §9 and the glossary (issue 341)
mesh/delivery-group group feat/341-a-merge-check-judges-the-merge checking: 0 of 3 member(s) ready
mesh/merge-gate pass: the change touches no module of the mesh's graph
mesh/repo-check pass: its merge-check.sh passed
mesh/delivery superseded: a newer head of the same pull request
e373474db7
A merge check now judges the head merged into a named trunk commit and its
verdict goes out of date when the trunk moves; the designs and the glossary say
so, with the tests that hold it.
Author
Contributor

Delivery novox/hq@09916e2bbc07 — delivered since 2026-10-12T16:11:51Z

Delivery plan — builds nothing: the change touches no module of the mesh's graph

Group feat/341-a-merge-check-judges-the-merge, in order: novox/hq@09916e2bbc → novox/mesh-controller@875ebc093e → novox/mesh-catalog@41b6e10077 → novox/mesh-lab@79108a72a0

Transitions

  • 2026-10-12 15:46 (new) → proposed (announced): novox/hq#332's head announced
  • 2026-10-12 15:51 proposed → checked (checked): the verdict names this commit
  • 2026-10-12 15:51 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
  • 2026-10-12 16:11 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move
  • 2026-10-12 16:11 published → delivered (done): nothing for a walk to move

The commit's note under refs/notes/mesh-plan keeps every transition: git log --notes=mesh-plan.

<!-- mesh-delivery:view --> **Delivery** `novox/hq@09916e2bbc07` — **delivered** since 2026-10-12T16:11:51Z **Delivery plan** — builds nothing: the change touches no module of the mesh's graph **Group** `feat/341-a-merge-check-judges-the-merge`, in order: novox/hq@09916e2bbc07 → novox/mesh-controller@875ebc093e18 → novox/mesh-catalog@41b6e10077ef → novox/mesh-lab@79108a72a0df - novox/mesh-controller@875ebc093e18 before novox/mesh-catalog@41b6e10077ef: built by - composed together: pass — every machine composes with the change as it did without (4 of 4 compose) **Transitions** - 2026-10-12 15:46 (new) → proposed (announced): novox/hq#332's head announced - 2026-10-12 15:51 proposed → checked (checked): the verdict names this commit - 2026-10-12 15:51 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail - 2026-10-12 16:11 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move - 2026-10-12 16:11 published → delivered (done): nothing for a walk to move The commit's note under `refs/notes/mesh-plan` keeps every transition: `git log --notes=mesh-plan`.
jschoubben added 1 commit 2026-10-12 15:46:44 +00:00
Say in to-be 47 what ADR 0323 leaves as it is, and give to-be 45's revision its own paragraph
mesh/merge-gate pass: the change touches no module of the mesh's graph
mesh/repo-check pass: its merge-check.sh passed
mesh/delivery delivered
mesh/delivery-group group feat/341-a-merge-check-judges-the-merge merged: every member is merged
09916e2bbc
The review asked that the trunk-less verdicts, mesh-delivery's trunk head, the
refuse-ask race and the lost check's recheck be said, and found the revision
spliced mid-paragraph.
mesh-admin merged commit 9b7cab7978 into main 2026-10-12 16:11:27 +00:00
mesh-admin deleted branch feat/341-a-merge-check-judges-the-merge 2026-10-12 16:11:27 +00:00
Sign in to join this conversation.
No Reviewers
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: novox/hq#332