equal
deleted
inserted
replaced
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): |