X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9104-git-svn-follow-parent.sh;h=7ba76309ac9e57f9e5379bf93ecac4e6a4e4ad96;hb=dcb83ec18d5a79c438289eb55d9c01c61490d2e4;hp=9eab94569f352503c000f31db25ff61e46222715;hpb=400e58b74e701398bd7e51bd3f102f31cc45ee93;p=git.git diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh index 9eab94569..7ba76309a 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 &&