--- a/mercurial/merge.py Sun Feb 10 16:23:14 2013 +0000
+++ b/mercurial/merge.py Sun Feb 10 12:16:46 2013 +0000
@@ -515,12 +515,12 @@
_checkcollision(mctx, None)
else:
_checkcollision(mctx, (tctx, ancestor))
- if tctx.rev() is None:
- actions += _forgetremoved(tctx, mctx, branchmerge)
actions += manifestmerge(repo, tctx, mctx,
ancestor,
branchmerge, force,
partial)
+ if tctx.rev() is None:
+ actions += _forgetremoved(tctx, mctx, branchmerge)
return actions
def recordupdates(repo, actions, branchmerge):