Skip to content

Sparse: an untracked file at an out-of-view path that the other side adds wins over the merge result at completion (public and private paths) #248

Closed

Description

@tonibergholm-codento

Found reviewing #244. refuse_untracked_overwrite skips out-of-view paths by design and snapshot_files lets a file already on disk win, so on a sparse checkout an untracked file at a path the other side cleanly adds outside the view is committed instead of the addition, silently (no error). Reproduced on the public path with a plain merge + commit. On the private merge-in path (#244) the stop now leaves the file alone and completion commits its bytes into the sealed tree (before #244 the stop overwrote the user's file). Fix belongs in the shared guard for both paths: refuse (or treat as a conflict) when an untracked file exists at a path the merge adds outside the view, before any write.

Metadata

Metadata

Assignees

No one assigned

    Labels

    bugSomething isn't working

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions