Mercurial > hg
changeset 27121:b08c31cfc4b6
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().
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 23 Nov 2015 19:06:15 -0800 |
| parents | 37edc8e5ed4f |
| children | 77d760ba8dcd |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Fri Nov 27 20:23:23 2015 +0100 +++ b/mercurial/merge.py Mon Nov 23 19:06:15 2015 -0800 @@ -1151,8 +1151,8 @@ 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)