Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/localrepo.py @ 4537:2f489b00f8eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with mpm
author Brendan Cully <brendan@kublai.com>
date Sun, 10 Jun 2007 21:05:01 -0700
parents 720ae5085ee3
children 3f4555babe74
line wrap: on
line diff
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -810,6 +810,8 @@ class localrepository(repo.repository):
             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