Patchwork [1,of,2,V2] merge: stop emptying out 'cd' and 'dc' actions

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 14, 2015, 6:46 a.m.
Message ID <88a697eb28dfa94038ac.1447483602@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11401/
State Accepted
Headers show

Comments

Siddharth Agarwal - Nov. 14, 2015, 6:46 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447453462 28800
#      Fri Nov 13 14:24:22 2015 -0800
# Node ID 88a697eb28dfa94038ac89543cd40ee65b5ca00b
# Parent  b639b2f186bfc6a8c7a8818910d49e94afd1dcae
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.

Patch

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'][:]
 
         ### apply phase
         if not branchmerge: # just jump to the new rev