Commit ae2d3782 authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

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.
parent a88a10a933b2
......@@ -1119,6 +1119,11 @@
updated += msupdated
merged += msmerged
removed += msremoved
extraactions = ms.actions()
for a in 'rag':
progress(_updating, None, total=numupdates, unit=_files)
return updated, merged, removed, unresolved
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment