##// END OF EJS Templates
svn subrepo: attempt work around obstructed checkouts (issue2752)...
Augie Fackler -
r14041:bcc6ed0f default
parent child Browse files
Show More
@@ -621,6 +621,14 class svnsubrepo(abstractsubrepo):
621 self._svncommand(['revert', '--recursive'])
621 self._svncommand(['revert', '--recursive'])
622 status = self._svncommand(['checkout', state[0], '--revision', state[1]])
622 status = self._svncommand(['checkout', state[0], '--revision', state[1]])
623 if not re.search('Checked out revision [0-9]+.', status):
623 if not re.search('Checked out revision [0-9]+.', status):
624 # catch the case where the checkout operation is
625 # obstructed but the working copy is clean
626 if ('already a working copy for a different' in status and
627 not self.dirty()):
628 self.remove()
629 self.get(state, overwrite)
630 return
631 else:
624 raise util.Abort(status.splitlines()[-1])
632 raise util.Abort(status.splitlines()[-1])
625 self._ui.status(status)
633 self._ui.status(status)
626
634
General Comments 0
You need to be logged in to leave comments. Login now