Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 13333:60792fa3c1a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Patrick Mezard <pmezard@gmail.com>
date Tue, 01 Feb 2011 21:59:07 +0100
parents 7ebdfa37842e 927e3940bfc3
children fa921dcd9993
comparison
equal deleted inserted replaced
13331:9f2c6892e004 13333:60792fa3c1a8
599 except OSError: 599 except OSError:
600 pass 600 pass
601 601
602 def get(self, state, overwrite=False): 602 def get(self, state, overwrite=False):
603 if overwrite: 603 if overwrite:
604 self._svncommand(['revert', '--recursive', self._path]) 604 self._svncommand(['revert', '--recursive'])
605 status = self._svncommand(['checkout', state[0], '--revision', state[1]]) 605 status = self._svncommand(['checkout', state[0], '--revision', state[1]])
606 if not re.search('Checked out revision [0-9]+.', status): 606 if not re.search('Checked out revision [0-9]+.', status):
607 raise util.Abort(status.splitlines()[-1]) 607 raise util.Abort(status.splitlines()[-1])
608 self._ui.status(status) 608 self._ui.status(status)
609 609