Mercurial > hg

changeset 8745:8fd6f6b8b37d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: drop 'remote deleted' case
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 6b675c781c6d
children 84c44c9ed555
files mercurial/merge.py
diffstat 1 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
+++ b/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
@@ -226,10 +226,6 @@
                     act("prompt keep", "a", f)
             elif n[20:] != "u":
                 act("other deleted", "r", f)
-        else:
-            # file is created on branch or in working directory
-            if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
-                act("remote deleted", "r", f)
 
     for f, n in m2.iteritems():
         if partial and not partial(f):