Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 12369:6f0d9d79111f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: delay writing the mergestate during until commit is called This speeds up merges of lots of files considerably.
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Mon, 06 Sep 2010 17:35:49 +0200
parents f00953d9533c
children f1e8d6f6e682
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Sep 22 15:33:08 2010 -0500
+++ b/mercurial/commands.py	Mon Sep 06 17:35:49 2010 +0200
@@ -2990,6 +2990,8 @@
 
                 # replace filemerge's .orig file with our resolve file
                 util.rename(a + ".resolve", a + ".orig")
+
+    ms.commit()
     return ret
 
 def revert(ui, repo, *pats, **opts):