Skip to content

[needs review] sweep sweep/tags-2026-08-11-9: 3 tag fix(es) across 2 squad(s) - #692

Open
swackhamer wants to merge 6 commits into
mainfrom
sweep/tags-2026-08-11-9
Open

[needs review] sweep sweep/tags-2026-08-11-9: 3 tag fix(es) across 2 squad(s)#692
swackhamer wants to merge 6 commits into
mainfrom
sweep/tags-2026-08-11-9

Conversation

@swackhamer

Copy link
Copy Markdown
Collaborator

Sweep sweep/tags-2026-08-11-9

Evidence table

Tag Exiftool-Value Oxidex-Value Sample count
Composite:Duration '2.64 s' '2.64 s' 1
DjVu:Note 'Must escape double quotes (") and backslashes (\)' 'Must escape double quotes (") and backslashes (\)' 1
XMP:ComponentsConfiguration 'Y, Cb, Cr, -' 'Y, Cb, Cr, -' 1

Judgment queue

No commits in this sweep require judgment-queue review -- everything ships mechanically.

Format: DJVU
Tag: DjVu:Note
Sample: /tmp/oxidex-exiftool-cache/combined-samples/DjVu.djvu
Exiftool-Value: 'Must escape double quotes (") and backslashes (\\)'
Oxidex-Value: 'Must escape double quotes (") and backslashes (\\)'
Verified: recheck-pass gaps=1->0
Worker: tail-9
Format: APE
Tag: Composite:Duration
Sample: /tmp/oxidex-exiftool-cache/combined-samples/APE.ape
Exiftool-Value: '2.64 s'
Oxidex-Value: '2.64 s'
Perl-Ref: APE.pm
Verified: recheck-pass gaps=1->0
Worker: tail-5
Format: BPG
Tag: XMP:ComponentsConfiguration
Sample: /tmp/oxidex-exiftool-cache/combined-samples/BPG.bpg
Exiftool-Value: 'Y, Cb, Cr, -'
Oxidex-Value: 'Y, Cb, Cr, -'
Perl-Ref: Exif.pm
Verified: recheck-pass gaps=1->0
Worker: xmp-1
Worker-authored Rust reaches this branch semantically validated but never
style-checked: validate_fix_commit.py, the per-commit merger check and the
post-merge recheck all assert behaviour (gap deltas, no duplicate
emissions, no unexplained oxidex-only keys) and none of them look at
formatting. CI's "Lint & Audit" job runs `cargo fmt --all -- --check`, so
an unformatted sweep branch fails CI by construction.

Measured on PR #124 (branch sweep/tags-2026-07-26-1, the first sweep PR
ever opened): CI run 30186389305 -- "Build & Test" success, "Lint &
Audit" failure, and the failing step is literally `Run cargo fmt --all --
--check`. Kept as a separate commit so the tag-fix diffs stay readable.
swackhamer added a commit that referenced this pull request Aug 11, 2026
…ouched

Follow-up to #691. Measured 2026-08-11 in production: PR #692 duplicated
#690 (byte-identical diffs, md5-verified) -- the #691 fix's own
full-tree comparison missed it, because #690's branch was cut BEFORE
#691 itself landed on origin/main, so it legitimately lacks the
scripts/ changes #691 added. #692's branch, cut after #691 merged,
carries those changes. A raw `diff --quiet <candidate>..HEAD` sees
that unrelated drift as "different" and can never again match #690,
no matter how many more times the same tag gap gets re-solved
identically -- and the same defeat recurs for every future round
whenever ANY unrelated commit lands on main while a sweep PR sits
open, which given "the fleet publishes, it never merges" is routine.

Fix: scope the comparison to `git diff --name-only origin_ref..HEAD`
-- the paths THIS round's own squad merges actually touched -- instead
of a full-tree diff. That isolates the tag-fix content from incidental
history the two branches don't share.

New regression test reproduces the exact #692-vs-#690 shape: an
unrelated commit lands on main between when the open PR's branch was
cut and when the new round's branch is cut, with the identical tag fix
on both. Confirmed the test fails against the unversioned (pre-fix)
code and passes with it. Full suite: 102 + 240 tests green.
swackhamer added a commit that referenced this pull request Aug 11, 2026
…ouched (#693)

Follow-up to #691. Measured 2026-08-11 in production: PR #692 duplicated
#690 (byte-identical diffs, md5-verified) -- the #691 fix's own
full-tree comparison missed it, because #690's branch was cut BEFORE
#691 itself landed on origin/main, so it legitimately lacks the
scripts/ changes #691 added. #692's branch, cut after #691 merged,
carries those changes. A raw `diff --quiet <candidate>..HEAD` sees
that unrelated drift as "different" and can never again match #690,
no matter how many more times the same tag gap gets re-solved
identically -- and the same defeat recurs for every future round
whenever ANY unrelated commit lands on main while a sweep PR sits
open, which given "the fleet publishes, it never merges" is routine.

Fix: scope the comparison to `git diff --name-only origin_ref..HEAD`
-- the paths THIS round's own squad merges actually touched -- instead
of a full-tree diff. That isolates the tag-fix content from incidental
history the two branches don't share.

New regression test reproduces the exact #692-vs-#690 shape: an
unrelated commit lands on main between when the open PR's branch was
cut and when the new round's branch is cut, with the identical tag fix
on both. Confirmed the test fails against the unversioned (pre-fix)
code and passes with it. Full suite: 102 + 240 tests green.
swackhamer added a commit that referenced this pull request Aug 11, 2026
…695)

Second follow-up to #691/#693. Measured 2026-08-11 in production: PR
#694 duplicated #692 (byte-identical diffs, md5-verified) despite
#693's path-scoped duplicate check. The scoped diff DID find a
difference -- but it was pure rustfmt whitespace (a 3-line match arm
collapsed to one line), nothing semantic. #692's branch had already
been through format_sweep_branch's fmt-and-commit step in its own
round; this round's comparison ran on raw, pre-fmt worker output,
because both idempotency checks (origin_ref and the open-PR one) are
commit-to-commit diffs that only ever compare what THIS round has
committed so far -- which, at that point in run_sweep, has never been
through fmt. Unformatted content can never tree-match a PR that
already went through fmt, no matter how many times the same gap gets
re-solved with functionally identical code.

Fix: run format_sweep_branch once, early -- right before the
origin_ref zero-delta check -- so both idempotency checks compare
already-formatted content. The later format_sweep_branch call (after
the evidence table / judgment queue are built, where it has always
lived) is usually now a no-op ("already cargo-fmt clean"); kept in
place because commits_contributed resolves each squad's contribution
from merge_infos boundaries recorded before any fmt call, so an early
fmt commit can never leak into the evidence table regardless of when
it happens -- but the evidence table's own construction still must not
move earlier than it already is.

New regression test reproduces the exact #694-vs-#692 shape: the
already-open PR's branch carries the fmt-normalized form of a fix,
this round's squad commit carries the identical fix pre-fmt. Confirmed
the test fails against the pre-fix code and passes with this fix.
One existing assertion (which of the two format_sweep_branch calls
reports "committed") updated to match: the commit now happens at the
earlier call, so the later one correctly reports false.

Full suite: 103 tests green.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant