Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 23650 b85c548ab14d
parent 23649 18ab5e5955df
child 23651 72da02d7f126 
--- a/mercurial/merge.py	Wed Nov 19 11:44:00 2014 -0800
+++ b/mercurial/merge.py	Wed Nov 19 11:48:30 2014 -0800
@@ -488,10 +488,10 @@
                 # following table:
                 #
                 # force  branchmerge  different  |  action
-                #   n         *           n      |    get
+                #   n         *           n      |   create
                 #   n         *           y      |   abort
-                #   y         n           *      |    get
-                #   y         y           n      |    get
+                #   y         n           *      |   create
+                #   y         y           n      |   create
                 #   y         y           y      |   merge
                 #
                 # Checking whether the files are different is expensive, so we
@@ -501,9 +501,9 @@
                     if different:
                         aborts.append((f, "ud"))
                     else:
-                        actions[f] = ('g', (fl2,), "remote created")
+                        actions[f] = ('c', (fl2,), "remote created")
                 elif not branchmerge:
-                    actions[f] = ('g', (fl2,), "remote created")
+                    actions[f] = ('c', (fl2,), "remote created")
                 else:
                     different = _checkunknownfile(repo, wctx, p2, f)
                     if different:
@@ -517,7 +517,7 @@
                     aborts.append((f, 'ud'))
                 else:
                     if acceptremote:
-                        actions[f] = ('g', (fl2,), "remote recreating")
+                        actions[f] = ('c', (fl2,), "remote recreating")
                     else:
                         actions[f] = ('dc', (fl2,), "prompt deleted/changed")
 
@@ -529,6 +529,10 @@
         raise util.Abort(_("untracked files in working directory differ "
                            "from files in requested revision"))
 
+    for f, (m, args, msg) in actions.iteritems():
+        if m == 'c':
+            actions[f] = ('g', args, msg)
+
     return actions, diverge, renamedelete
 
 def _resolvetrivial(repo, wctx, mctx, ancestor, actions):
mercurial