Show More
@@ -1119,6 +1119,11 b' def applyupdates(repo, actions, wctx, mc' | |||||
1119 | updated += msupdated |
|
1119 | updated += msupdated | |
1120 | merged += msmerged |
|
1120 | merged += msmerged | |
1121 | removed += msremoved |
|
1121 | removed += msremoved | |
|
1122 | ||||
|
1123 | extraactions = ms.actions() | |||
|
1124 | for a in 'rag': | |||
|
1125 | actions[a].extend(extraactions[a]) | |||
|
1126 | ||||
1122 | progress(_updating, None, total=numupdates, unit=_files) |
|
1127 | progress(_updating, None, total=numupdates, unit=_files) | |
1123 |
|
1128 | |||
1124 | return updated, merged, removed, unresolved |
|
1129 | return updated, merged, removed, unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now