Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 18042:551e2901192e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix mistake in moved _checkcollision call from 5881d5b7552f
author Kevin Bullock <kbullock@ringworld.org>
date Thu, 06 Dec 2012 22:07:44 -0600
parents 8b846dbc57b6
children 6c35b53cd28b
comparison
equal deleted inserted replaced
18041:f0cfa27c712a 18042:551e2901192e
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,