Skip to content

Private branch merge stop: --abort fails and a binary-conflict .theirs sidecar is committed #246

Closed

Description

@tonibergholm-codento

Found while reviewing #244 (fix for #240); both predate it and are unrelated to sparse.

  1. 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.
  2. 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.

Activity

  1. tonibergholm-codento commented on Oct 20, 2026

    @tonibergholm-codento
    CollaboratorAuthor

    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).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions