Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: drop 'remote deleted' case
authorMatt Mackall <mpm@selenic.com>
Mon, 08 Jun 2009 18:14:44 -0500
changeset 8745 8fd6f6b8b37d
parent 8744 6b675c781c6d
child 8746 84c44c9ed555
merge: drop 'remote deleted' case
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- 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):
hg-stable