Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 7739:edcb56991afe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with mpm
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sat, 07 Feb 2009 23:29:12 +0100
parents 26bdb7109170 9f73bddb9d0b
children ec9b726a9428
line wrap: on
line diff
--- a/mercurial/commands.py	Sat Feb 07 18:46:13 2009 +0100
+++ b/mercurial/commands.py	Sat Feb 07 23:29:12 2009 +0100
@@ -645,6 +645,9 @@
     elif ui.verbose:
         ui.write(_('committed changeset %d:%s\n') % (rev,short(node)))
 
+    ms = merge_.mergestate(repo)
+    ms.reset(node)
+
 def copy(ui, repo, *pats, **opts):
     """mark files as copied for the next commit