Mercurial > hg

diff mercurial/merge.py @ 26990:11b1832db8ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.applyupdates: switch to mergestate.clean() See the previous patches for why we're doing this.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 17 Nov 2015 17:04:53 -0800
parents 416b2b7d3068
children 2ddc92bae4a7
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Nov 17 17:04:32 2015 -0800
+++ b/mercurial/merge.py	Tue Nov 17 17:04:53 2015 -0800
@@ -853,8 +853,7 @@
     """
 
     updated, merged, removed, unresolved = 0, 0, 0, 0
-    ms = mergestate(repo)
-    ms.reset(wctx.p1().node(), mctx.node())
+    ms = mergestate.clean(repo, wctx.p1().node(), mctx.node())
     moves = []
     for m, l in actions.items():
         l.sort()