Log in

Commit 5dd811a1

5dd811a1487a

Merged from mrmrs-15c4c5
mrmrs · 1 month ago · 20 files +19 added ~1 modified
M docs/prior-art.md
@@ -3,7 +3,27 @@
33 This page records prior-art influence without importing another project's
44 benchmark implementation. The suite may learn from behavior categories,
55 reporting vocabulary, and measurement controls, but it must not vendor external
6-benchmark code or translate external shell scripts into local Python.
6+benchmark code or translate external shell scripts into local Python, except
7+for the recorded exception below.
8+
9+## Recorded Exception: gitoxide merge baselines (2026-09-28)
10+
11+`suites/merge/vendor/gitoxide/` vendors three gix-merge fixture scripts
12+(`tree-baseline.sh`, `tree-cartesian-baseline.sh`, `text-baseline.sh`)
13+verbatim from gitoxide commit `acf906f8fcdb8e8d143570737786543dc5a204a0`.
14+
15+- License: MIT OR Apache-2.0 (permissive). Both license texts and a `NOTICE`
16+ are carried next to the scripts. The SHA-256 of each script is pinned in
17+ `UPSTREAM.json` and checked by `tests/test_merge_suite.py`.
18+- Rationale: the scripts are a curated, upstream-maintained catalogue of
19+ merge-ort edge cases, including an exhaustive 14x14 operation product.
20+ Re-deriving them would lose that coverage and add transcription risk. They
21+ are only executed with real Git to build fixture repositories. Git's own
22+ merge-ort computes the reference result, and no gitoxide code runs in the
23+ measured path.
24+- Scope: this exception covers only these files. GPL sources, including
25+ Git's t64xx merge tests, stay clean-room: shapes are re-expressed from
26+ testcase prose and cited by ID, and no text is copied.
727
828 ## Clean-Room Rule
929