[PATCH 7 of 7 mergedriver] merge.applyupdates: extend action queues with ones returned from mergestate

[Siddharth Agarwal]

# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1448047591 28800
#      Fri Nov 20 11:26:31 2015 -0800
# Node ID 3e17318018fe01c93b9dd4bbdfb9c8358b547ea5
# Parent  d3f3222f45eef7acf90322d4ba5cc9c21f25b7b1
# Available At http://42.netv6.net/sid0-wip/hg/
#              hg pull http://42.netv6.net/sid0-wip/hg/ -r 3e17318018fe
merge.applyupdates: extend action queues with ones returned from mergestate

These queues will always be empty at the moment -- we're going to fill them up
in upcoming patches.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1119,6 +1119,11 @@ def applyupdates(repo, actions, wctx, mc
     updated += msupdated
     merged += msmerged
     removed += msremoved
+
+    extraactions = ms.actions()
+    for a in 'rag':
+        actions[a].extend(extraactions[a])
+
     progress(_updating, None, total=numupdates, unit=_files)
 
     return updated, merged, removed, unresolved