Mercurial > hg

changeset 3116:920f54a2249e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: more simplification of m2 manifest scanning
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 20:10:54 -0500
parents bb74f809bc95
children 7a635ef25132
files mercurial/merge.py
diffstat 1 files changed, 7 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Sun Sep 17 20:00:14 2006 -0500
+++ b/mercurial/merge.py	Sun Sep 17 20:10:54 2006 -0500
@@ -175,17 +175,15 @@
 
     for f, n in m2.iteritems():
         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 overwrite or backwards:
+                ui.debug(_("local deleted %s, recreating\n") % f)
+                action.append((f, "g", m2.execf(f), n))
+            elif n != ma[f]:
+                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: