equal
deleted
inserted
replaced
260 |
260 |
261 def applyupdates(repo, action, wctx, mctx): |
261 def applyupdates(repo, action, wctx, mctx): |
262 "apply the merge action list to the working directory" |
262 "apply the merge action list to the working directory" |
263 |
263 |
264 updated, merged, removed, unresolved = 0, 0, 0, 0 |
264 updated, merged, removed, unresolved = 0, 0, 0, 0 |
265 action.sort() |
|
266 |
|
267 ms = mergestate(repo) |
265 ms = mergestate(repo) |
268 ms.reset(wctx.parents()[0].node()) |
266 ms.reset(wctx.parents()[0].node()) |
269 moves = [] |
267 moves = [] |
|
268 action.sort() |
270 |
269 |
271 # prescan for merges |
270 # prescan for merges |
272 for a in action: |
271 for a in action: |
273 f, m = a[:2] |
272 f, m = a[:2] |
274 if m == 'm': # merge |
273 if m == 'm': # merge |