Mercurial > hg-stable
changeset 27080:ae2d3782d818
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.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Fri, 20 Nov 2015 11:26:31 -0800 |
| parents | a88a10a933b2 |
| children | 37290f2f2c3b |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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