summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2011-01-06 18:29:23 (GMT)
committerEric Wong <normalperson@yhbt.net>2011-01-07 22:14:36 (GMT)
commite17aa8a9dca972ca278dd91a097873101066e964 (patch)
tree901ac421c638cf46b7c6e02f91372ebf174e7146
parent9cfdbf9bef8ba8694fde7e9c562b124d2f46d69d (diff)
downloadgit-e17aa8a9dca972ca278dd91a097873101066e964.zip
git-e17aa8a9dca972ca278dd91a097873101066e964.tar.gz
git-e17aa8a9dca972ca278dd91a097873101066e964.tar.bz2
t9157-*.sh: Add an svn version check
Acked-by: Eric Wong <normalperson@yhbt.net> Acked-by: Steven Walter <stevenrwalter@gmail.com> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
-rwxr-xr-xt/t9157-git-svn-fetch-merge.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh
index da582c5..accf61e 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].[0-6])
+ 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 &&