Files
Chronos/src
Alby96andClaude Opus 5.5 65b7cdf91b fix(copies): a changed photo no longer wedges a merge's resumed verify
A merge's Verify stage journals a second version before filing it. When
the copy then failed or read other bytes (the file rewritten by an
editor or a sync tool, a drive dropping out before an edit), every retry
read new bytes for that journalled frame and stopped with changed,
keeping the journal, so the merge failed the same way until cancelled.

- When the kept sequence does not hold the journalled bytes, nothing was
  filed: the frame leaves SecondVersions and VersionShas and is verified
  as on a first visit, which files the photo as it is now.
- When it holds them (filed, then the exclusion failed), they are left
  out of Main and the merge stops and drops its journal, so the next run
  plans again instead of a cancel leaving them in Main for good.

Refs #73

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-18 14:30:27 +01:00
..