# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1304150438 18000
# Node ID 92db9667d15ae7b5caf1a9653c2d45b5fdaf0e67
# Parent  58e58406ed190ce59c78de13e82da1f6bc47f06c
subrepo: backout bcc6ed0f6c3b

diff -r 58e58406ed19 -r 92db9667d15a mercurial/subrepo.py
--- 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):