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
Open
Conversation
…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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.exeis the MSYSTEM=MINGW64 wrapper and rewritesPATHso/mingw64/binoutranks 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,opensslshipped;gh,jq,pythonnot. 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/mainfrom the allocating worktree. I had explained that mechanism to three other seats today before needing it myself.