##// END OF EJS Templates
dirstate: don't fail when dropping a not-tracked file (issue3080)...
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.
Matt Mackall -
r15399:41453d55 2.0 stable
Show More
Name Size Modified Last Commit Author
/ contrib
hgfixes
hgsh
macosx
vim
win32
wix
bash_completion Loading ...
buildrpm Loading ...
casesmash.py Loading ...
check-code.py Loading ...
convert-repo Loading ...
debugcmdserver.py Loading ...
debugshell.py Loading ...
dumprevlog Loading ...
hg-ssh Loading ...
hgk Loading ...
hgweb.fcgi Loading ...
hgweb.wsgi Loading ...
logo-droplets.svg Loading ...
memory.py Loading ...
mercurial.el Loading ...
mercurial.spec Loading ...
mergetools.hgrc Loading ...
mq.el Loading ...
perf.py Loading ...
pylintrc Loading ...
python-hook-examples.py Loading ...
sample.hgrc Loading ...
setup3k.py Loading ...
shrink-revlog.py Loading ...
simplemerge Loading ...
tcsh_completion Loading ...
tcsh_completion_build.sh Loading ...
tmplrewrite.py Loading ...
undumprevlog Loading ...
xml.rnc Loading ...
zsh_completion Loading ...