Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.applyupdates: extend action queues with ones returned from mergestate
authorSiddharth Agarwal <sid0@fb.com>
Fri, 20 Nov 2015 11:26:31 -0800
changeset 27080 ae2d3782d818
parent 27079 a88a10a933b2
child 27081 37290f2f2c3b
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.
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial