Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 6746:1dca460e7d1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename checkfolding to checkcase
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Jun 2008 13:58:24 -0500
parents b148e9099133
children f6c00b17387c
comparison
equal deleted inserted replaced
6745:ed01fa8ceaa6 6746:1dca460e7d1e
458 458
459 ### calculate phase 459 ### calculate phase
460 action = [] 460 action = []
461 if not force: 461 if not force:
462 _checkunknown(wc, p2) 462 _checkunknown(wc, p2)
463 if not util.checkfolding(repo.path): 463 if not util.checkcase(repo.path):
464 _checkcollision(p2) 464 _checkcollision(p2)
465 action += _forgetremoved(wc, p2, branchmerge) 465 action += _forgetremoved(wc, p2, branchmerge)
466 action += manifestmerge(repo, wc, p2, pa, overwrite, partial) 466 action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
467 467
468 ### apply phase 468 ### apply phase