[PATCH] svn subrepo: out bcc6ed0f6c3b which is a broken fix
Augie Fackler
durin42 at gmail.com
Sat Apr 30 03:02:20 CDT 2011
# HG changeset patch
# User Augie Fackler <durin42 at gmail.com>
# Date 1304150515 18000
# Node ID dd7d6ae3dbcb471864913fdb562300972aa81f24
# Parent 58e58406ed190ce59c78de13e82da1f6bc47f06c
svn subrepo: out bcc6ed0f6c3b which is a broken fix
diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -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):
More information about the Mercurial-devel
mailing list