Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 7121:b801d6e5dc83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename: handle renaming to a target marked removed
author Matt Mackall <mpm@selenic.com>
date Sat, 18 Oct 2008 04:26:09 -0500
parents 7b5c063b0b94
children cb6395fc16a9
line wrap: on
line diff
--- a/mercurial/localrepo.py	Fri Oct 17 12:12:33 2008 +0200
+++ b/mercurial/localrepo.py	Sat Oct 18 04:26:09 2008 -0500
@@ -1149,7 +1149,7 @@
                                "symbolic link\n") % dest)
             else:
                 wlock = self.wlock()
-                if dest not in self.dirstate:
+                if self.dirstate[dest] in '?r':
                     self.dirstate.add(dest)
                 self.dirstate.copy(source, dest)
         finally: