Skip to content

Re-anchor .file_mapping.json on a commit that exists in imaginaire4 main - #192

Merged
yy-code-nv merged 1 commit into
mainfrom
yangyangt/reanchor-source-commit
Aug 13, 2026
Merged

Re-anchor .file_mapping.json on a commit that exists in imaginaire4 main#192
yy-code-nv merged 1 commit into
mainfrom
yangyangt/reanchor-source-commit

Conversation

@yy-code-nv

Copy link
Copy Markdown
Collaborator

_source_commit pointed at dde4e6ecd8, which was only ever reachable from the branch yangyangt/cf-release-source-breaks. Its content did land in i4 main (via 85db463277, verbatim), but the commit itself did not, so nothing in main's history resolves that sha.

That matters because the drift gate and the backport check both reconstruct their baseline as forward(i4 @ _source_commit), reading it with git show in an i4 checkout. Against a fresh clone of i4 main -- which is what CI has -- that lookup fails, and with it the entire baseline the two gates compare against.

Re-anchor on da723843aa, the merge-base of that branch and i4 main, so the baseline resolves from main's history alone. The mapping itself is unchanged: same 533 entries, same _dest_commit.

_source_commit pointed at dde4e6ecd8, which was only ever reachable from the
branch yangyangt/cf-release-source-breaks. Its content did land in i4 main
(via 85db463277, verbatim), but the commit itself did not, so nothing in main's
history resolves that sha.

That matters because the drift gate and the backport check both reconstruct
their baseline as forward(i4 @ _source_commit), reading it with `git show` in
an i4 checkout. Against a fresh clone of i4 main -- which is what CI has --
that lookup fails, and with it the entire baseline the two gates compare
against.

Re-anchor on da723843aa, the merge-base of that branch and i4 main, so the
baseline resolves from main's history alone. The mapping itself is unchanged:
same 533 entries, same _dest_commit.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
@lfengad
lfengad enabled auto-merge (squash) August 13, 2026 09:21
@yy-code-nv
yy-code-nv disabled auto-merge August 13, 2026 09:21
@yy-code-nv
yy-code-nv enabled auto-merge (squash) August 13, 2026 09:21
@yy-code-nv
yy-code-nv merged commit cd5e450 into main Aug 13, 2026
9 checks passed
@yy-code-nv
yy-code-nv deleted the yangyangt/reanchor-source-commit branch August 13, 2026 09:37
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.

4 participants