Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 11101:502474839293

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: only scan unknowns when needed
author Matt Mackall <mpm@selenic.com>
date Wed, 05 May 2010 20:21:57 -0500
parents 7a0d096e221e
children 21a7ae13208f
comparison
equal deleted inserted replaced
11100:83968ae4aaf2 11101:502474839293
489 # Allow jumping branches if clean and specific rev given 489 # Allow jumping branches if clean and specific rev given
490 overwrite = True 490 overwrite = True
491 491
492 ### calculate phase 492 ### calculate phase
493 action = [] 493 action = []
494 wc.status(unknown=True) # prime cache
494 if not force: 495 if not force:
495 _checkunknown(wc, p2) 496 _checkunknown(wc, p2)
496 if not util.checkcase(repo.path): 497 if not util.checkcase(repo.path):
497 _checkcollision(p2) 498 _checkcollision(p2)
498 action += _forgetremoved(wc, p2, branchmerge) 499 action += _forgetremoved(wc, p2, branchmerge)