Mercurial > hg

changeset 8751:e8d80e0835c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make locally-added file test more correct
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 9b8733291dd0
children f177bdab261b
files mercurial/merge.py
diffstat 1 files changed, 2 insertions(+), 2 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
@@ -198,8 +198,6 @@
             else: # case 2 A,B/B/B or case 4,21 A/B/B
                 act("local copied/moved to " + f2, "m",
                     f, f2, f, fmerge(f, f2, f2), False)
-        elif n[20:] == "a": # added, no remote
-            act("remote deleted", "f", f)
         elif f in ma: # clean, a different, no remote
             if n != ma[f]:
                 if repo.ui.prompt(
@@ -209,6 +207,8 @@
                     act("prompt delete", "r", f)
                 else:
                     act("prompt keep", "a", f)
+            elif n[20:] == "a": # added, no remote
+                act("remote deleted", "f", f)
             elif n[20:] != "u":
                 act("other deleted", "r", f)