# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-11-13 22:24:22
# Node ID 042422f3a7734b220e6d2a111abf51fc06c9cd3f
# Parent  32bd195ab78752a7324a2f40a93f8e6026d3f9bc

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.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1262,7 +1262,6 @@ def update(repo, node, branchmerge, forc
                 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 @@ def update(repo, node, branchmerge, forc
                   "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()):