Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 6762:f67d1468ac50

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: add sort helper
author Matt Mackall <mpm@selenic.com>
date Fri, 27 Jun 2008 18:28:45 -0500
parents f6c00b17387c
children 482581431dcd
comparison
equal deleted inserted replaced
6761:cb981fc955fb 6762:f67d1468ac50
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