Commit 9be1653
committed
fix(replay): re-anchor lockfile on reachable [fern-replay] init commit
`current_generation`, the second `generations[]` entry, and
`patch-4894603d.base_generation` all referenced
`b61c6fa84f61d6c77d9f4ab0fa6c2bf512c8680d` — a commit that doesn't
exist in this repo's git history (verified with `git cat-file` and
`git merge-base --is-ancestor` after a full unshallow fetch). Its
recorded `tree_hash` (`063654dc...`) is also gone from the object
database.
Likely origin: a past fern-bot PR landed via squash-merge, which
produces a new SHA on `master` distinct from the SHA recorded in the
`[fern-replay]` commit's lockfile. That recorded SHA then orphans.
Customer-visible effect: every `fern generate` loads this lockfile,
can't resolve `b61c6fa`, falls into the deepest detection fallback,
captures ~200 pre-Fern commits as orphan patches, and fails when the
resulting PR body exceeds GitHub's 65,536-char limit.
This change re-anchors all three references on
`ffe61f6a098cb25a875019a37f2615045b97344e` — the original
`[fern-replay] Initialize Replay for SDK customizations (#833)`
commit by fern-api[bot], which is reachable on master. The
generation entry's `tree_hash`, `timestamp`, and `base_branch_head`
all use the real values from that commit.
`patch-4894603d`'s `patch_content` and `theirs_snapshot` are kept
untouched. The 8208-line `theirs_snapshot` is the safety net that
lets the applicator reconstruct the customer's intended
`src/auth0/management/__init__.py` content on the next regeneration
even if the line-anchored diff's context has drifted against the new
anchor's tree.1 parent 1026b4d commit 9be1653
1 file changed
Lines changed: 7 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | | - | |
11 | | - | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
12 | 12 | | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
17 | 16 | | |
18 | 17 | | |
19 | 18 | | |
20 | 19 | | |
21 | 20 | | |
22 | 21 | | |
23 | | - | |
| 22 | + | |
24 | 23 | | |
25 | 24 | | |
26 | 25 | | |
| |||
0 commit comments