DIVE-4090 probe: merge-shaped PR must resolve the ratchet base to its second parent (do not merge) - #18
Closed
lodar wants to merge 3 commits into
Closed
DIVE-4090 probe: merge-shaped PR must resolve the ratchet base to its second parent (do not merge)#18lodar wants to merge 3 commits into
lodar wants to merge 3 commits into
Conversation
…ot a branch name and a pasted sha The weekly upstream-sync PR carries a merge commit whose second parent is upstream's tip; the ratchet's default base (HEAD^1, our pre-merge main) reads every upstream commit as this PR's diff (DIVE-3850). Two fixes keyed the override on the branch name and pasted the sha: the name slipped in week 4 (DIVE-4069), the widened predicate now over-matches any `dive-*-sync` feature branch onto week 3's stale sha (DIVE-4090). - scripts/resolve-file-size-base.sh runs before `File size policy`: on a pull_request run it fetches exactly this PR's commits on top of the depth-2 checkout (--shallow-exclude=<base>, trees only), walks the PR's first-parent chain, and exports the first foreign second parent as CHECK_FILE_SIZES_BASE. Anything else keeps HEAD^1. It prints one `ratchet-base:` line saying which base the run got and why. - scripts/test-resolve-file-size-base.sh: four shapes at fetch-depth 2 from a bare origin (plain feature, sync + fix-up, feature that merged main, push) plus the full-history path. - ci.yml: fetch-depth back to a plain 2 (upstream-identical), the env literal and both name predicates removed. Receipts: on the week-3 tree (PR #14's merge-ref shape, the case where the bases disagree) HEAD^1 is rc=1 on `agent_models_tests.rs: 965 -> 1001` and the derived base c3132c3 is rc=0 on desktop/web/mobile; a depth-2 emulation of week 4's merge ref resolves to 3c7f288 in 1.6s; live PRs #9 and #10 resolve to HEAD^1.
… -- not for merging
Author
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
1 participant
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.
Probe for #17, per the DIVE-4090 row's arm: a merge-shaped PR whose second parent is foreign (commit
a45493ff7e33e9461186bef9fdebd0042a088435, one new file on top of a main ancestor, never on main). Read theResolve file size ratchet basestep inDetect Changed Paths: it must printratchet-base: a45493ff7e33e9461186bef9fdebd0042a088435 (second parent of merge commit …, the foreign side of a wholesale merge; 1 first-parent commit(s) on this PR). Whatever the ratchet then says about that diff is not the point; the resolved base is. Close after reading.