Mercurial > hg

changeset 26961:042422f3a773

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: stop emptying out 'cd' and 'dc' actions (1) These aren't currently read from anywhere, so emptying this out is pointless. (2) These *will* be read from later in upcoming patches, and not emptying them out will be important then.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 13 Nov 2015 14:24:22 -0800
parents 32bd195ab787
children fa2daf0e61ab
files mercurial/merge.py
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Nov 06 22:32:00 2015 +0800
+++ b/mercurial/merge.py	Fri Nov 13 14:24:22 2015 -0800
@@ -1262,7 +1262,6 @@
                 actions['r'].append((f, None, "prompt delete"))
             else:
                 actions['a'].append((f, None, "prompt keep"))
-        del actions['cd'][:]
 
         for f, args, msg in sorted(actions['dc']):
             flags, = args
@@ -1271,7 +1270,6 @@
                   "use (c)hanged version or leave (d)eleted?"
                   "$$ &Changed $$ &Deleted") % f, 0) == 0:
                 actions['g'].append((f, (flags,), "prompt recreating"))
-        del actions['dc'][:]
 
         # divergent renames
         for f, fl in sorted(diverge.iteritems()):