Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/localrepo.py
changeset 4535 720ae5085ee3
parent 4531 b51a8138292a
child 4541 3f4555babe74 
--- 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
mercurial