From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Date: Thu, 6 Jan 2011 18:29:23 +0000 (+0000)
Subject: t9157-*.sh: Add an svn version check
X-Git-Tag: v1.7.4-rc2~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e17aa8a9dca972ca278dd91a097873101066e964;p=git.git

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>
---

diff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh
index da582c538..accf61eb0 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 &&