Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/localrepo.py @ 1233:5381b0d88e9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix abort message for clone
author mpm@selenic.com
date Tue, 13 Sep 2005 14:18:18 -0500
parents 78ceaf83f28f
children 9ee8428d84a1
line wrap: on
line diff
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1108,12 +1108,10 @@ class localrepository:
                     self.ui.debug("other deleted %s\n" % f)
                     remove.append(f) # other deleted it
             else:
-                if n == m1.get(f, nullid): # same as parent
-                    if p2 == pa: # going backwards?
-                        self.ui.debug("remote deleted %s\n" % f)
-                        remove.append(f)
-                    else:
-                        self.ui.debug("local created %s, keeping\n" % f)
+                # file is not in ancestor or target
+                if n == m1.get(f, nullid) or force: # same as parent
+                    self.ui.debug("remote deleted %s\n" % f)
+                    remove.append(f)
                 else:
                     self.ui.debug("working dir created %s, keeping\n" % f)