janhoy commented on PR #5021:
URL: https://github.com/apache/solr/pull/5021#issuecomment-6044313614
I had Claude Code (Fable) work through my own review comments above (or
rather Claude Opus's comments), one commit per item, on this branch. I also
merged in `main`. Nothing new in the design, this is the review applied:
- Dropped `--cherry-pick` from the commit selection. Measured against the
real 9.11.0 history: 191s per target with it, 0.03s without, same six commits.
Re-runs stay idempotent since an already-applied pick comes out empty and gets
`--skip`ped.
- `recover_cherry_pick` now only removes a conflicting unreleased entry if
it also exists in `changelog/v{version}/`, same guard as the stale-entry pass.
Anything else falls through to the manual-resolve error.
- Forward-port refuses to run on a dirty tree, and the `git restore` is
paired with a `git clean` limited to `changelog/*/version-summary.md` so an
untracked summary can't block the next checkout either.
- The release branch is pulled `--ff-only` like the targets, so the final
push doesn't get rejected.
- Nits: `-z` on the git path listings (non-ASCII entry names), `--dry-run`
honoured in `recover_cherry_pick`, wizard text reworded and now mentions the
clean-tree requirement and the pulls, git 2.23 noted in the docstring.
> 🤖 Implemented and verified with Claude Code. Every fix was reproduced
failing first and then passing in a scratch repo with a fake gradle:
9x/9_11/10x/main branches, a 9.x feature commit with a changelog entry, a
modify/delete conflict, non-ASCII entry name, untracked version-summary,
same-name entry without counterpart, dirty tree, local branches behind origin,
`--push`, re-run and `--dry-run`. I've read through the diff and I'm fine with
it.
I think this is ready to merge once CI is happy.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
