Skip to content

backlog: file #1330 -- PR 487's resolver conflict is a judgment merge whose obvious resolution re-arms a fixed defect - #527

Open
wshallwshall wants to merge 1 commit into
mainfrom
lander/1330-487-judgment-merge
Open

backlog: file #1330 -- PR 487's resolver conflict is a judgment merge whose obvious resolution re-arms a fixed defect#527
wshallwshall wants to merge 1 commit into
mainfrom
lander/1330-487-judgment-merge

Conversation

@wshallwshall

Copy link
Copy Markdown
Collaborator

Filed under a live 5-hour rung, because it cannot be finished in the remaining window and the analysis behind it would otherwise die with this session.

Why #487 is not a mechanical merge

It conflicts with main in five files, all in the bash-interpreter resolver area #505 rewrote. An adversarial per-file pass — one classifier per file, each handed to a skeptic told to refute it — found that some of #487's assertions were written against the old interpreter selection order.

#505 reversed that order for cause: bin/bash.exe is the MSYSTEM=MINGW64 wrapper and rewrites PATH so /mingw64/bin outranks anything a caller prepends. So resolving toward #487 re-arms the exact defect #505 fixed, rather than merely duplicating work.

The blast radius is every test that PATH-stubs a binary Git ships in mingw64/bin — measured: curl, git, openssl shipped; gh, jq, python not. That asymmetry is why #505's release-age rows failed while its gh-stub rows passed, and why it read as flakiness for hours.

What the item carries so nobody re-derives it

One process note

This was first committed from a scratch worktree and the ledger gate correctly refused it: #1330 is allocated to lander-5c09c3, and the gate compares the committing path to the allocation record. The push succeeded while the commit failed, briefly publishing a branch byte-identical to main — an empty branch advertising work that was not there.

Re-done with the documented escape, git switch -c <new> origin/main from the allocating worktree. I had explained that mechanism to three other seats today before needing it myself.

…nd the obvious resolution re-arms a fixed defect

Filed under a live 5-hour rung because it cannot be finished in the remaining window, and because
the analysis behind it would otherwise die with this session.

An adversarial per-file pass found some of 487's assertions were written against the OLD interpreter
selection order, which 505 reversed for cause: bin/bash.exe is the MINGW64 wrapper and rewrites PATH
so /mingw64/bin outranks a caller's prepend. Resolving toward 487 therefore re-arms the defect 505
fixed, rather than merely duplicating work.

The item carries the pointer to the per-file verdicts so a taker reads them instead of re-deriving,
and records two smaller stranded pieces: 1321's banner flip, handed over after 1322 landed first via
525, and two ASVS re-scores whose item numbers nobody can derive because no cell-to-item map exists.
One of those re-scores is a pass to PARTIAL -- a RE-OPEN, not a closure.

Filed from the ALLOCATING worktree after the gate correctly refused the same commit from a scratch
one. The escape is the documented git switch -c from the allocating tree, which I had explained to
three other seats today before needing it myself.
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