Commit f3d7d32
chore(cargo-anvil): regenerate .anvil.lock for anvil 0.9.0 after rebase
PR 169 has been green on all 28 checks and carries two approving automated
reviews, but GitHub reported `mergeable_state: dirty` and it could not merge.
The 2026-09-08 diary entry recorded exactly that state -- "both automated
reviews recommend approval, but the branch is currently dirty against `main`"
-- and left it as the outstanding blocker.
The conflict was entirely in `.anvil.lock`. `main` released cargo-anvil 0.9.0
(3bf8d54) with a new `catalog_checksum`, while this branch still carried the
0.8.0 header plus its own checksum for `justfiles/anvil/impact.just`, which the
branch regenerates because it edits
`crates/cargo-anvil/templates/justfiles/anvil/impact.just`. Both sides touched
the same two lines.
`.anvil.lock` is generated, so it was NOT hand-merged. At each conflicting step
the lock was taken from the rebase target and the final `chore: regenerate
.anvil.lock after rebase` commit -- whose entire content was the stale lock --
was dropped, then the file was rewritten by the tool itself with
`cargo run -p cargo-anvil -- anvil`. Hand-resolving the hunk was rejected: the
`catalog_checksum` is derived from the whole template catalog, so a plausible
manual merge can be textually reasonable and still wrong.
Verified rather than assumed:
- `cargo run -p cargo-anvil -- anvil --dry-run` before the regen reported
"Manifest update required: .anvil.lock" -- i.e. the exact `regenerate-check`
gate in `.github/workflows/regenerate-check.yml` would have failed.
- The regen produced only the two expected lines: the 0.9.0 catalog checksum
and the `justfiles/anvil/impact.just` checksum. No generated file content
changed, confirming the rebase preserved the reviewed behaviour.
- `--dry-run` afterwards reports 92 unchanged and no manifest update.
- `cargo +1.97 test -p cargo-anvil --all-features --locked`: 415 unit tests and
all integration suites pass, including the 21 impact tests this branch
rewrites.
- `just anvil-clippy` clean.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>1 parent 5aa300b commit f3d7d32
1 file changed
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
233 | 233 | | |
234 | 234 | | |
235 | 235 | | |
236 | | - | |
| 236 | + | |
237 | 237 | | |
238 | 238 | | |
239 | 239 | | |
| |||
0 commit comments