Mercurial > hg

changeset 14049:92db9667d15a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: backout bcc6ed0f6c3b
author Matt Mackall <mpm@selenic.com>
date Sat, 30 Apr 2011 03:00:38 -0500
parents 58e58406ed19
children ecaa78594983
files mercurial/subrepo.py
diffstat 1 files changed, 1 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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):