Mercurial > public > mercurial-scm > hg

diff mercurial/dirstate.py @ 1488:08c7851969cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
only files in normal state should be marked as deleted fix a traceback when you removed an added file
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 02 Nov 2005 16:08:48 -0800
parents 2bc6cd62a29c
children 91c0e8d7ddcf
line wrap: on
line diff
--- a/mercurial/dirstate.py	Wed Nov 02 15:46:31 2005 -0800
+++ b/mercurial/dirstate.py	Wed Nov 02 16:08:48 2005 -0800
@@ -390,7 +390,7 @@
                         nonexistent = False
                 # XXX: what to do with file no longer present in the fs
                 # who are not removed in the dirstate ?
-                if nonexistent:
+                if nonexistent and type in "nm":
                     deleted.append(fn)
                     continue
             # check the common case first