Mercurial > hg-stable

diff mercurial/localrepo.py @ 7848:89e05c02a4af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: move reset to localrepo.commit This way rebase doesn't leave a stale resolve state
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Mar 2009 16:58:41 -0500
parents 4421abf8c85d
children 553aa0cbeab6 47b0a881638f
line wrap: on
line diff
--- a/mercurial/localrepo.py	Mon Mar 16 16:58:41 2009 -0500
+++ b/mercurial/localrepo.py	Mon Mar 16 16:58:41 2009 -0500
@@ -824,8 +824,11 @@
                                                     "(see hg resolve)"))
             wctx = context.workingctx(self, (p1, p2), text, user, date,
                                       extra, changes)
-            return self._commitctx(wctx, force, force_editor, empty_ok,
-                                   use_dirstate, update_dirstate)
+            r = self._commitctx(wctx, force, force_editor, empty_ok,
+                                use_dirstate, update_dirstate)
+            ms.reset()
+            return r
+
         finally:
             del lock, wlock