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
merge/pick/rebase --abort deletes an untracked user file at an in-view path that theirs holds and the tip does not (public and private abort) #255
Noted while fixing #246 (PR #252). Abort removes every in-view path that theirs holds and the restored tip does not. If the user has an untracked (or ignored) file at such a path, abort deletes it. The public abort already behaves this way; the private abort (new in #252) copies it. A stopped merge refuses to lay a file over an untracked one (refuse_untracked_overwrite), so in practice the collision arises only from files the user created after the stop. Fix: abort should delete only what the stop recorded as laid (CONFLICT_PLAINTEXT, CONFLICT_SIDECARS, and tracked-in-theirs paths whose on-disk bytes still equal what the stop wrote), and leave anything else. Also report (not ignore) a failed unlink of decrypted files on the private abort.
Activity
fix(repo): refuse an abort whose kept file blocks a directory, cover …
fix(repo): abort overwrites only the stopped tree's own bytes; stream…
fix(repo): keep a symlink at a recorded protected path; index skipped…
fix(repo): private abort keeps symlinks, stop deletes before conflict…
fix(repo): a restore never writes through a symlink (ref #255 #256)
fix(repo): abort discards an edited conflict, reports retained plaint…
fix(repo): never delete through a symlinked parent; treat ENOTDIR as …
test(repo): pin lstat and under_symlink semantics (ref #255 #256)
fix(repo): delete or overwrite only the stop's own files on materiali…