Mercurial > hg

comparison mercurial/merge.py @ 27080:ae2d3782d818

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 98fc58378a3f
comparison
equal deleted inserted replaced
27079:a88a10a933b2 27080:ae2d3782d818
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):