[PATCH 2 of 2] subrepo: correct revision in svn checkout

[Carter, Eli]

# HG changeset patch
# User Eli Carter <eli.carter at tektronix.com>
# Date 1309445106 18000
# Branch stable
# Node ID 3709fb8587c533a3c701747826ec9492186d856d
# Parent  136de604f22c1cdd3eb819d2da4c4b086b1def87
subrepo: fix for svn subrepo with recreated branch bug

diff -r 136de604f22c -r 3709fb8587c5 mercurial/subrepo.py
--- a/mercurial/subrepo.py	Thu Jun 30 09:44:19 2011 -0500
+++ b/mercurial/subrepo.py	Thu Jun 30 09:45:06 2011 -0500
@@ -663,7 +663,9 @@
         args = ['checkout']
         if self._svnversion >= (1, 5):
             args.append('--force')
-        args.extend([state[0], '--revision', state[1]])
+        # The revision must be specified at the end of the URL to properly
+        # update to a directory which has since been deleted and recreated.
+        args.append('%s@%s' % (state[0], state[1]))
         status, err = self._svncommand(args, failok=True)
         if not re.search('Checked out revision [0-9]+.', status):
             if ('is already a working copy for a different URL' in err
exporting patch:
<fdopen>