Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 4535:720ae5085ee3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: fix bug where dirstate for removed file is confused This fixes issue586
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Jun 2007 21:16:58 -0500
parents b51a8138292a
children 3f4555babe74
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sun Jun 10 19:16:20 2007 -0500
+++ b/mercurial/localrepo.py	Sun Jun 10 21:16:58 2007 -0500
@@ -810,6 +810,8 @@
             if f in m1:
                 del m1[f]
                 removed.append(f)
+            elif f in m2:
+                removed.append(f)
         mn = self.manifest.add(m1, tr, linkrev, c1[0], c2[0], (new, removed))
 
         # add changeset