[PATCH] git-svn: handle changed svn command-line syntax

From: Sam Vilain <sam.vilain@catalyst.net.nz>
Date: Sep 21, 2007, 02:02 UTC
Message-ID: <11903401552164-git-send-email-sam.vilain@catalyst.net.nz>
In-Reply-To: <11903401551812-git-send-email-sam.vilain@catalyst.net.nz>

Previously, if you passed a revision and a path to svn, it meant to look back at that revision and select that path. New behaviour is to get the path then go back to the revision. The old syntax is selected with new syntax PATH@REV. This new syntax is not supported by the old tools, so we have to try both in turn.

Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>
---
 t/t9104-git-svn-follow-parent.sh |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 9eab945..7ba7630 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -51,8 +51,10 @@ test_expect_success 'init and fetch from one svn-remote' "
         "
 
 test_expect_success 'follow deleted parent' "
-        svn cp -m 'resurrecting trunk as junk' \
-               -r2 $svnrepo/trunk $svnrepo/junk &&
+        (svn cp -m 'resurrecting trunk as junk' \
+               $svnrepo/trunk@2 $svnrepo/junk ||
+         svn cp -m 'resurrecting trunk as junk' \
+               -r2 $svnrepo/trunk $svnrepo/junk) &&
         git config --add svn-remote.svn.fetch \
           junk:refs/remotes/svn/junk &&
         git-svn fetch -i svn/thunk &&

-- 
1.5.2.4