Artifact 74b0cfd2385202ace2622d154e2376dbc3056b3b87bca359d0a68c11e27d510c:
- File
www/reference.html
— part of check-in
[0627425be0]
at
2026-08-24 15:17:04
on branch merge-dirty-tree
— merge: merge into a dirty working tree instead of refusing it
The current side becomes the working tree, so a divergent path compares what the operator actually has rather than what the check-in says is on disk -- which is the disagreement B-merge-14 existed to avoid. A clean tree scans to no divergences and every side reads from the store exactly as before.
Rollback needs no new machinery: captureMergeImages already reads the worktree, so an abandoned merge restores the uncommitted bytes.
Also adds the fault-injection coverage the carried update path was missing: a carried update that fails mid-apply must restore the WORKING bytes, not the check-in's. Verified by mutation -- breaking the baseline overlay fails both tests. (user: dmestas, size: 113227) [annotate] [blame] [check-ins using] [more...]