mirror of
https://github.com/jmcorgan/fips.git
synced 2026-10-06 11:38:24 +00:00
Johnathan Corgan
5896021ad2
Forward-merge of the maint cut. Four conflicts, each resolved in a stated direction. Cargo.toml, Cargo.lock and README.md all resolve toward master. master is 0.5.0-dev, which outranks 0.4.2, and the same logic covers the README status badge. The README also matters for a reason the plan does not mention: master's platform table carries FreeBSD and Android columns that maint's does not, because that work landed here and correctly never went to maint. Taking maint's side would have deleted those rows, and none of the plan's post-merge greps looks at the README. CHANGELOG.md is a reconciliation rather than the insertion the plan describes, because both branches already carried a [0.4.2] section: master's was the pre-reorganization copy it inherited from an earlier maint merge, still dated unreleased. The two hold the identical 80 bullets, established by sorting and diffing the bullet sets rather than by reading them, and differ only in grouping. So master takes the released section wholesale and keeps its own [Unreleased]. The reverse check passes on both blocks by set comparison: [Unreleased] holds 40 bullets matching master's pre-merge set exactly, and [0.4.2] holds 80 matching the released set exactly. No bullet is on the wrong side of that line, which is the failure every heading grep is blind to. RELEASE-NOTES.md needed no resolution. The plan expects a conflict there and warns against hand-editing the mirror pair; master never touched the file while maint replaced it, so it auto-merged.