equal
deleted
inserted
replaced
456 # collision check is not needed for clean update |
456 # collision check is not needed for clean update |
457 if (not branchmerge and |
457 if (not branchmerge and |
458 (force or not tctx.dirty(missing=True, branch=False))): |
458 (force or not tctx.dirty(missing=True, branch=False))): |
459 _checkcollision(mctx, None) |
459 _checkcollision(mctx, None) |
460 else: |
460 else: |
461 _checkcollision(mctx, tctx) |
461 _checkcollision(mctx, (tctx, ancestor)) |
462 if not force: |
462 if not force: |
463 _checkunknown(repo, tctx, mctx) |
463 _checkunknown(repo, tctx, mctx) |
464 if tctx.rev() is None: |
464 if tctx.rev() is None: |
465 action += _forgetremoved(tctx, mctx, branchmerge) |
465 action += _forgetremoved(tctx, mctx, branchmerge) |
466 action += manifestmerge(repo, tctx, mctx, |
466 action += manifestmerge(repo, tctx, mctx, |