Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 7734:9f73bddb9d0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reset mergestate after commit
author Martin Geisler <mg@daimi.au.dk>
date Thu, 25 Dec 2008 10:42:01 +0100
parents deec6628e62b
children edcb56991afe
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Jan 28 14:27:44 2009 -0600
+++ b/mercurial/commands.py	Thu Dec 25 10:42:01 2008 +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