Show More
| @@ -630,15 +630,7 b' class svnsubrepo(abstractsubrepo):' | |||||
| 630 | self._svncommand(['revert', '--recursive']) |
|
630 | self._svncommand(['revert', '--recursive']) | |
| 631 | status = self._svncommand(['checkout', state[0], '--revision', state[1]]) |
|
631 | status = self._svncommand(['checkout', state[0], '--revision', state[1]]) | |
| 632 | if not re.search('Checked out revision [0-9]+.', status): |
|
632 | if not re.search('Checked out revision [0-9]+.', status): | |
| 633 | # catch the case where the checkout operation is |
|
633 | raise util.Abort(status.splitlines()[-1]) | |
| 634 | # obstructed but the working copy is clean |
|
|||
| 635 | if ('already a working copy for a different' in status and |
|
|||
| 636 | not self.dirty()): |
|
|||
| 637 | self.remove() |
|
|||
| 638 | self.get(state, overwrite) |
|
|||
| 639 | return |
|
|||
| 640 | else: |
|
|||
| 641 | raise util.Abort(status.splitlines()[-1]) |
|
|||
| 642 | self._ui.status(status) |
|
634 | self._ui.status(status) | |
| 643 |
|
635 | |||
| 644 | def merge(self, state): |
|
636 | def merge(self, state): | |
General Comments 0
You need to be logged in to leave comments.
Login now