Tibsfox dd5d54f182 enhance(reapply-patches): post-merge verification to catch dropped hunks (#1775) ...

* feat(reapply-patches): post-merge verification to catch dropped hunks

Add a post-merge verification step to the reapply-patches workflow that
detects when user-modified content hunks are silently lost during
three-way merge. The verification performs line-count sanity checks and
hunk-presence verification against signature lines from each user
addition.

Warnings are advisory — the merge result is kept and the backup remains
available for manual recovery. This strengthens the never-skip invariant
from PR #1474 by ensuring not just that files are processed, but that
their content survives the merge intact.

Closes #1758

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* enhance(reapply-patches): add structural ordering test and refactor test setup (#1758)

- Add ordering test: verification section appears between merge-write
  and status-report steps (positional constraint, not just substring)
- Move file reads into before() hook per project test conventions
- Update commit prefix from feat: to enhance: per contribution taxonomy
  (addition to existing workflow, not new concept)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

2026-04-06 15:20:06 -04:00

3.0 KiB

Raw Permalink Blame History

View Raw