Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 18650:de0bd4bfc6d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: run _forgetremoved after manifestmerge _forgetremoved can trigger manifest construction, but we only want it to happen after manifestmerge, so that our attempt to read the manifests in the right order in an upcoming patch actually works.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 10 Feb 2013 12:16:46 +0000
parents a8648f32b8ed
children e556659340f0
comparison
equal deleted inserted replaced
18649:0969980308c7 18650:de0bd4bfc6d7
513 if (not branchmerge and 513 if (not branchmerge and
514 (force or not tctx.dirty(missing=True, branch=False))): 514 (force or not tctx.dirty(missing=True, branch=False))):
515 _checkcollision(mctx, None) 515 _checkcollision(mctx, None)
516 else: 516 else:
517 _checkcollision(mctx, (tctx, ancestor)) 517 _checkcollision(mctx, (tctx, ancestor))
518 if tctx.rev() is None:
519 actions += _forgetremoved(tctx, mctx, branchmerge)
520 actions += manifestmerge(repo, tctx, mctx, 518 actions += manifestmerge(repo, tctx, mctx,
521 ancestor, 519 ancestor,
522 branchmerge, force, 520 branchmerge, force,
523 partial) 521 partial)
522 if tctx.rev() is None:
523 actions += _forgetremoved(tctx, mctx, branchmerge)
524 return actions 524 return actions
525 525
526 def recordupdates(repo, actions, branchmerge): 526 def recordupdates(repo, actions, branchmerge):
527 "record merge actions to the dirstate" 527 "record merge actions to the dirstate"
528 528