Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.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 5bf5fd1e2a74
children 496ae1ea4698
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Mar 16 16:58:41 2009 -0500
+++ b/mercurial/merge.py	Mon Mar 16 16:58:41 2009 -0500
@@ -14,9 +14,10 @@
     def __init__(self, repo):
         self._repo = repo
         self._read()
-    def reset(self, node):
+    def reset(self, node=None):
         self._state = {}
-        self._local = node
+        if node:
+            self._local = node
         shutil.rmtree(self._repo.join("merge"), True)
     def _read(self):
         self._state = {}