AtlatestRepositorysigil-doc

sigil-doc / tree / test / transcripts / sd-p2 / mergerename-arm-three-way.txt

1PROVENANCE CORRECTION, added after the merge (Fable review delta 1).
2=====================================================================
3This transcript was WRITTEN PRE-REBASE and its original first line named
4"HEAD" symbolically, which nobody can check later. The exact commit is
5recorded here instead; the run's results below are unaltered.
6
7 the transcript's "HEAD" was: 32961e4 "Update the two pinned book digests
8 for the D13 rename"
9 master at the time: acb9adf
10 merge-tree(acb9adf, 32961e4) = 96a5ef09 <- the tree exercised below
12 Re-derived rather than remembered:
13 $ git merge-tree --write-tree acb9adf 32961e4
14 96a5ef0900908769c70c24d41c036bc7489a9fdb
16THE SHAs ABOVE ARE PRE-REBASE AND ARE NOT IN MASTER'S HISTORY. The branch
17was rebased onto master for linear history, which rewrote every commit.
18Post-rebase equivalent of 32961e4 is 3595b11.
20THE TREE EXERCISED BELOW IS NOT THE TREE THAT MERGED, and that difference
21was itself a review finding: 96a5ef09 was already stale when this ran.
22The merged and reviewed product is 98ab5912, at master 4dcb41d. The
23staleness is benign and was verified so, not assumed: every path differing
24between the two trees lies inside this arm's own exclusion set
25(test/gate-sd-p2-rename.sh, test/sabotage-sd-p2.sh, test/transcripts), so
26the population the arm actually scans is identical in both. The four-leg
27verification was additionally re-run on the rebased branch, whose tree IS
2898ab5912 -- see the SD-P2 row of the implementation plan.
30Original transcript follows.
31=====================================================================
33Merged tree: 96a5ef0900908769c70c24d41c036bc7489a9fdb
34 = git merge-tree --write-tree master(acb9adf454ed7a3f1bc66b4a7cf47dfefb003bb7) HEAD
361. rename arm on MY BRANCH:
37SD_P2_04_RENAME_COMPLETE population=84 planted=code-3/3+manuscript-2/2+container-not-matched aside_files=4 excluded=test/gate-sd-p2-rename.sh test/sabotage-sd-p2.sh test/transcripts transcripts-audited=evidence-only
392. rename arm on the MERGED TREE:
40SD_P2_04_RENAME_COMPLETE population=102 planted=code-3/3+manuscript-2/2+container-not-matched aside_files=4 excluded=test/gate-sd-p2-rename.sh test/sabotage-sd-p2.sh test/transcripts transcripts-audited=evidence-only
423. rename arm on the MERGED TREE with a real admonition planted (must be RED):
43book/practical-sigil/01-useful-first-script.sgd:77:@note
44gate-sd-p2-rename: a manuscript still uses @note as an admonition above
45exit=1 (1 = correctly caught)