Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 26962:fa2daf0e61ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make 'cd' and 'dc' actions store the same arguments as 'm' We're going to treat these conflicts similarly to merge conflicts, and this change to the way we store things in memory makes future code a lot simpler.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 13 Nov 2015 22:43:09 -0800
parents 042422f3a773
children 6618dfd3ea1c
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Nov 13 14:24:22 2015 -0800
+++ b/mercurial/merge.py	Fri Nov 13 22:43:09 2015 -0800
@@ -623,7 +623,8 @@
                     if acceptremote:
                         actions[f] = ('r', None, "remote delete")
                     else:
-                        actions[f] = ('cd', None,  "prompt changed/deleted")
+                        actions[f] = ('cd', (f, None, f, False, pa.node()),
+                                      "prompt changed/deleted")
                 elif n1[20:] == 'a':
                     # This extra 'a' is added by working copy manifest to mark
                     # the file as locally added. We should forget it instead of
@@ -673,7 +674,8 @@
                 if acceptremote:
                     actions[f] = ('c', (fl2,), "remote recreating")
                 else:
-                    actions[f] = ('dc', (fl2,), "prompt deleted/changed")
+                    actions[f] = ('dc', (None, f, f, False, pa.node()),
+                                  "prompt deleted/changed")
 
     return actions, diverge, renamedelete
 
@@ -1264,7 +1266,8 @@
                 actions['a'].append((f, None, "prompt keep"))
 
         for f, args, msg in sorted(actions['dc']):
-            flags, = args
+            f1, f2, fa, move, anc = args
+            flags = p2[f2].flags()
             if repo.ui.promptchoice(
                 _("remote changed %s which local deleted\n"
                   "use (c)hanged version or leave (d)eleted?"