--- a/mercurial/subrepo.py Fri Apr 29 14:54:01 2011 +0200
+++ b/mercurial/subrepo.py Sat Apr 30 03:00:38 2011 -0500
@@ -630,15 +630,7 @@
self._svncommand(['revert', '--recursive'])
status = self._svncommand(['checkout', state[0], '--revision', state[1]])
if not re.search('Checked out revision [0-9]+.', status):
- # catch the case where the checkout operation is
- # obstructed but the working copy is clean
- if ('already a working copy for a different' in status and
- not self.dirty()):
- self.remove()
- self.get(state, overwrite)
- return
- else:
- raise util.Abort(status.splitlines()[-1])
+ raise util.Abort(status.splitlines()[-1])
self._ui.status(status)
def merge(self, state):