Mercurial > hg > mercurial-source

comparison mercurial/subrepo.py @ 13326:927e3940bfc3 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: fix update -C with svn subrepos when cwd != repo.root
author Patrick Mezard <pmezard@gmail.com>
date Tue, 01 Feb 2011 21:39:28 +0100
parents c19b9282d3a7
children 60792fa3c1a8
comparison
equal deleted inserted replaced
13324:551856dea9a6 13326:927e3940bfc3
589 except OSError: 589 except OSError:
590 pass 590 pass
591 591
592 def get(self, state, overwrite=False): 592 def get(self, state, overwrite=False):
593 if overwrite: 593 if overwrite:
594 self._svncommand(['revert', '--recursive', self._path]) 594 self._svncommand(['revert', '--recursive'])
595 status = self._svncommand(['checkout', state[0], '--revision', state[1]]) 595 status = self._svncommand(['checkout', state[0], '--revision', state[1]])
596 if not re.search('Checked out revision [0-9]+.', status): 596 if not re.search('Checked out revision [0-9]+.', status):
597 raise util.Abort(status.splitlines()[-1]) 597 raise util.Abort(status.splitlines()[-1])
598 self._ui.status(status) 598 self._ui.status(status)
599 599