Mercurial > hg
comparison mercurial/subrepo.py @ 13532:d4c2f2ac3ff7
Merge with stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Fri, 04 Mar 2011 14:11:15 +0100 |
| parents | c12088259f64 67fbe566eff1 |
| children | f854b775c386 |
comparison
equal
deleted
inserted
replaced
| 13530:5f69af0d2fb3 | 13532:d4c2f2ac3ff7 |
|---|---|
| 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', state[0], '--revision', state[1]]) | 628 status = self._svncommand(['checkout', '--force', state[0], |
| 629 '--revision', state[1]]) | |
| 629 if not re.search('Checked out revision [0-9]+.', status): | 630 if not re.search('Checked out revision [0-9]+.', status): |
| 630 raise util.Abort(status.splitlines()[-1]) | 631 raise util.Abort(status.splitlines()[-1]) |
| 631 self._ui.status(status) | 632 self._ui.status(status) |
| 632 | 633 |
| 633 def merge(self, state): | 634 def merge(self, state): |