equal
deleted
inserted
replaced
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 |