Skip to content

Commit

Permalink
git-svn: handle changed svn command-line syntax
Browse files Browse the repository at this point in the history
Previously, if you passed a revision and a path to svn cp, 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 (like other commands that accept @REV
or -rREV do).  The more consistent 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>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Sam Vilain authored and Junio C Hamano committed Sep 21, 2007
1 parent d99c74e commit ffab626
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions t/t9104-git-svn-follow-parent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit ffab626

Please sign in to comment.