Mercurial > hg
comparison mercurial/subrepo.py @ 13559:42a34c0aeddc stable
subrepo: backout 67fbe566eff1, --force requires svn >= 1.5
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 07 Mar 2011 23:02:04 +0100 |
| parents | dea6efdd7ec4 |
| children | a2734c8322ac a7c9735307bd |
comparison
equal
deleted
inserted
replaced
| 13557:7509e36eed3b | 13559:42a34c0aeddc |
|---|---|
| 623 pass | 623 pass |
| 624 | 624 |
| 625 def get(self, state, overwrite=False): | 625 def get(self, state, overwrite=False): |
| 626 if overwrite: | 626 if overwrite: |
| 627 self._svncommand(['revert', '--recursive']) | 627 self._svncommand(['revert', '--recursive']) |
| 628 status = self._svncommand(['checkout', '--force', state[0], | 628 status = self._svncommand(['checkout', state[0], '--revision', state[1]]) |
| 629 '--revision', state[1]]) | |
| 630 if not re.search('Checked out revision [0-9]+.', status): | 629 if not re.search('Checked out revision [0-9]+.', status): |
| 631 raise util.Abort(status.splitlines()[-1]) | 630 raise util.Abort(status.splitlines()[-1]) |
| 632 self._ui.status(status) | 631 self._ui.status(status) |
| 633 | 632 |
| 634 def merge(self, state): | 633 def merge(self, state): |