# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1448047591 28800
# Node ID ae2d3782d8184366093efe82ddec0ab5b8f3b532
# Parent  a88a10a933b2f2c647c91d7c13114777226bcbea
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 -r a88a10a933b2 -r ae2d3782d818 mercurial/merge.py
--- a/mercurial/merge.py	Fri Nov 20 16:43:25 2015 -0800
+++ b/mercurial/merge.py	Fri Nov 20 11:26:31 2015 -0800
@@ -1119,6 +1119,11 @@
     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