# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-11-24 03:06:15
# Node ID b08c31cfc4b6c749cd00f78b249efc577527823f
# Parent  37edc8e5ed4f3c3ad20e3e429756fc50297ee38b

merge.applyupdates: add all actions returned from merge state

At the moment this is a no-op (the only actions defined are 'r', 'a' and 'g'),
but soon we're going to add other sorts of actions to the dictionary returned
from mergestate.actions().

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1151,8 +1151,8 @@ def applyupdates(repo, actions, wctx, mc
     removed += msremoved
 
     extraactions = ms.actions()
-    for a in 'rag':
-        actions[a].extend(extraactions[a])
+    for k, acts in extraactions.iteritems():
+        actions[k].extend(acts)
 
     progress(_updating, None, total=numupdates, unit=_files)