Mercurial > hg-stable

changeset 3115:bb74f809bc95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: reorder tests on m2 items in manifestmerge
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 20:00:14 -0500
parents c4e26f1ccfcc
children 920f54a2249e
files mercurial/merge.py
diffstat 1 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Sun Sep 17 19:54:01 2006 -0500
+++ b/mercurial/merge.py	Sun Sep 17 20:00:14 2006 -0500
@@ -174,23 +174,23 @@
                 ui.debug(_("working dir created %s, keeping\n") % f)
 
     for f, n in m2.iteritems():
-        if f in ma and n != ma[f]:
-            r = _("k")
-            if not overwrite:
-                r = ui.prompt(
-                    (_("remote changed %s which local deleted\n") % f) +
-                     _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
-            if r == _("k"):
-                action.append((f, "g", m2.execf(f), n))
-        elif f not in ma:
-            ui.debug(_("remote created %s\n") % f)
-            action.append((f, "g", m2.execf(f), n))
-        else:
-            if overwrite or backwards:
+        if f in ma:
+            if n != ma[f]:
+                r = _("k")
+                if not overwrite:
+                    r = ui.prompt(
+                        (_("remote changed %s which local deleted\n") % f) +
+                         _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
+                if r == _("k"):
+                    action.append((f, "g", m2.execf(f), n))
+            elif overwrite or backwards:
                 ui.debug(_("local deleted %s, recreating\n") % f)
                 action.append((f, "g", m2.execf(f), n))
             else:
                 ui.debug(_("local deleted %s\n") % f)
+        else:
+            ui.debug(_("remote created %s\n") % f)
+            action.append((f, "g", m2.execf(f), n))
 
     return action