Mercurial > public > mercurial-scm > hg

comparison 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
comparison
equal deleted inserted replaced
7847:30cb79d84352 7848:89e05c02a4af
12 class mergestate(object): 12 class mergestate(object):
13 '''track 3-way merge state of individual files''' 13 '''track 3-way merge state of individual files'''
14 def __init__(self, repo): 14 def __init__(self, repo):
15 self._repo = repo 15 self._repo = repo
16 self._read() 16 self._read()
17 def reset(self, node): 17 def reset(self, node=None):
18 self._state = {} 18 self._state = {}
19 self._local = node 19 if node:
20 self._local = node
20 shutil.rmtree(self._repo.join("merge"), True) 21 shutil.rmtree(self._repo.join("merge"), True)
21 def _read(self): 22 def _read(self):
22 self._state = {} 23 self._state = {}
23 try: 24 try:
24 localnode = None 25 localnode = None