Mercurial > hg

changeset 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 0969980308c7
children e556659340f0
files mercurial/merge.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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):