Submitter | Siddharth Agarwal |
---|---|
Date | Feb. 8, 2013, 9:13 p.m. |
Message ID | <787156b90b65abd9bb3a.1360358007@sid0x220> |
Download | mbox | patch |
Permalink | /patch/838/ |
State | Superseded, archived |
Headers | show |
Comments
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -472,8 +472,6 @@ def calculateupdates(repo, tctx, mctx, a _checkcollision(mctx, None) else: _checkcollision(mctx, (tctx, ancestor)) - if not force: - _checkunknown(repo, tctx, mctx) if tctx.rev() is None: actions += _forgetremoved(tctx, mctx, branchmerge) actions += manifestmerge(repo, tctx, mctx,