equal
deleted
inserted
replaced
1117 |
1117 |
1118 msupdated, msmerged, msremoved = ms.counts() |
1118 msupdated, msmerged, msremoved = ms.counts() |
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 |
1125 |
1130 |
1126 def recordupdates(repo, actions, branchmerge): |
1131 def recordupdates(repo, actions, branchmerge): |