novox/mesh-lab
7
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Merge pull request 'Register R349: a merge acted on late superseded the merge after it (hq issue 349)' (#95) from fix/349-replay into main

Browse Source
This commit was merged in pull request #95.
This commit is contained in:
mesh-admin
2026-10-13 03:54:15 +00:00
parent 0ca7a83e0b d16c3db9d2
commit 2aebf8f40e
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
replays/register.go
+16
View File
@@ -514,6 +514,22 @@ var Register = []Replay{
"refused as the controller's terminal's and leaves the layer as it was; at the terminal it is taken",
Package: "./cmd/mesh-controller", Test: "TestReplay340", Files: []string{"cmd/mesh-controller/replay340_test.go"},
Home: "mesh-controller", HomeRef: "e44c726a38125ade30a6d70cee9873a4e2ea6ac2"},
// A merge acted on late superseded the merge after it (2026-10-09): two catalogue merges were acted on in reverse
// order. The later one, a security fix to the forge's module, was planned first; the earlier one, handed over late,
// was planned after it, superseded its plan at tier 0 and planned the fixed module again at the commit without the
// fix, because a plan's age was read from when it was made, never from the branch's order. The fix (mesh-controller
// #179) ordered a branch's plans by their merge times and planned a late merge at the newer commit; ADR 0276
// (mesh-controller #197) later replaced that with batches, and the replay holds the outcome under both. A test of its
// own in the controller, written with only what it had before — a mesh, registered modules, following.SourceMoved,
// the plans the inventory keeps — laid over the commit before. Needs a store: MESH_TEST_POSTGRES. Fix is the merge of
// its pull request; Home is the commit that added the replay, reachable once its pull request merges.
{ID: "R349", Issue: 349, Kind: InRepository, Repository: "mesh-controller", Fix: "9ca7952d5e0a5ed1e23bdcf5aea36fe967e62d14",
What: "a merge handed over late superseded the plan of the merge made after it, and planned the module that " +
"merge fixed again at the earlier commit, without the fix",
Asserts: "with the later merge acted on first and the earlier one after it, every plan left standing that plans " +
"the fixed module plans it at the later merge's commit, and one does",
Package: "./cmd/mesh-controller", Test: "TestReplay349", Files: []string{"cmd/mesh-controller/replay349_test.go"},
Home: "mesh-controller", HomeRef: "5740874ce3b99b47c27403f33e6c6d2a334ad3d7"},
}
// Find is the replay of that id, or of that issue.