X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9157-git-svn-fetch-merge.sh;h=991d2aa1be63c2440db93e6237201383e28a498a;hb=f6aca0dc4d6b7ed9bf2bff399e3fcb47eafdce4b;hp=da582c53825a5719f6c9d82983e0951afcccd0df;hpb=c835288be4cac722a20f9601a920879206a0ff61;p=git.git diff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh index da582c538..991d2aa1b 100755 --- a/t/t9157-git-svn-fetch-merge.sh +++ b/t/t9157-git-svn-fetch-merge.sh @@ -6,6 +6,14 @@ test_description='git svn merge detection' . ./lib-git-svn.sh +svn_ver="$(svn --version --quiet)" +case $svn_ver in +0.* | 1.[0-4].*) + skip_all="skipping git-svn test - SVN too old ($svn_ver)" + test_done + ;; +esac + test_expect_success 'initialize source svn repo' ' svn_cmd mkdir -m x "$svnrepo"/trunk && svn_cmd mkdir -m x "$svnrepo"/branches &&