You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Private branch merge stop: --abort fails and a binary-conflict .theirs sidecar is committed #246
Found while reviewing #244 (fix for #240); both predate it and are unrelated to sparse.
Repo::merge_abort on a stopped merge into a private branch fails with Core(WrongKind(.., "snapshot")): it calls get_snapshot on the branch tip, which is a manifest. The merge state stays in place.
The private conflict stop writes <path>.theirs sidecars but records no CONFLICT_SIDECARS / CONFLICT_PLAINTEXT, so commit_private tracks the sidecar into the sealed tree and leaves it on disk. The public path drops sidecars from the tree and removes them.
Related edge from #244 review: at a private merge stop, an undecryptable merged protected entry leaves the prior plaintext on disk (Err(_) => continue), and completion then treats the path as unchanged and carries the prior entry. Reachable only when the public side re-seals a protected file to a recipient set that no longer includes the completer. Also: an untracked file at an out-of-view path the public side adds beats the re-derived entry at completion (the private stop is not covered by refuse_untracked_overwrite).
Activity
fix(repo): re-derive the private merge outcome on every completion, n…
tonibergholm-codento commentedon Oct 20, 2026
Related edge from #244 review: at a private merge stop, an undecryptable merged protected entry leaves the prior plaintext on disk (
Err(_) => continue), and completion then treats the path as unchanged and carries the prior entry. Reachable only when the public side re-seals a protected file to a recipient set that no longer includes the completer. Also: an untracked file at an out-of-view path the public side adds beats the re-derived entry at completion (the private stop is not covered byrefuse_untracked_overwrite).fix(repo): decide out-of-view paths by the merge on a sparse private …
docs(repo): match the ADR to private abort's removal rule (ref #246)
test(repo): assert temp dirs are gone after the private abort tests (…
fix(repo): abort and sidecars for a stopped merge into a private bran…