Skip to content
Snippets Groups Projects
Commit 41453d55 authored by Matt Mackall's avatar Matt Mackall
Browse files

dirstate: don't fail when dropping a not-tracked file (issue3080)

Complex merges with divergent renames can cause a file to be 'moved'
twice, causing dirstate.drop() to be called twice. Rather than try to
ensure there are no unexpected corner cases where this can happen, we
simply ignore drops of files that aren't tracked.
parent 474279be
Branches
Tags
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment