fix(resolve_base): a main push whose HEAD is behind the tip is a push shape too — main red on 6157d1924 - #3201
Merged
Conversation
…med HEAD as its own base and was refused — main went red on 6157d19 while a later merge had landed; the push shape is 'on main's first-parent line', not 'is the tip' (row 19) Pmat-Ticket: PMAT-1098 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
noahgift
enabled auto-merge
September 13, 2026 09:03
|
§13.11 rung 1 — quorum shadow verdict Shadow mode: this records a verdict and merges nothing. A refusal |
check_roadmap_diff_additive.sh reported base id(s) missing at head: this branch forked before they landed on main, and a plain update takes one side of the file whole. Resolved as main's roadmap plus this branch's own new entries, each at its sorted slot among same-prefix peers. The other three roadmap guards pass on the result. Pmat-Ticket: PMAT-1098 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
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.
Main went red on 6157d19 (run 34747052599):
check_hardcoded_paths.shrefused with "the resolver named HEAD itself as the base (merge-base(origin/main, HEAD)); never the tree against itself". The run's guard-tree started at 08:16Z, after the next squash (daa07e6) had landed on main, so HEAD was on main but no longer its tip.resolve_base.shrecognised the push shape only when HEAD is the tip; one commit behind, merge-base(origin/main, HEAD) is HEAD and the run is refused. Any main push whose run starts after the next merge lands hits this.Fix: push shape = HEAD is on origin/main's first-parent line (tip or behind it), base = HEAD's first parent. "Ancestor of the tip" alone is wrong: a feature commit merged into main is an ancestor too and its base is the merge-base (row 15 catches that). New case-table row 19 (HEAD behind the tip in an isolated clone) is RED on main's resolver and GREEN here; rows 1–25 all pass;
check_hardcoded_paths.sh --full-if-capablepasses on this tree.no-close: the red run is a guard defect on a merged commit; no issue was filed for it (T-5: fix, do not file).
🤖 Generated with Claude Code