Sync with 1.8.3.1

diff --git a/t/t9159-git-svn-no-parent-mergeinfo.sh b/t/t9159-git-svn-no-parent-mergeinfo.sh
index 85120b70db8cfb60b8d8c38f85a9038aa856468a..69e4815781c190207d406a4871a5dc5252690239 100755 (executable)
--- a/t/t9159-git-svn-no-parent-mergeinfo.sh
+++ b/t/t9159-git-svn-no-parent-mergeinfo.sh
@@ -2,6 +2,14 @@
 test_description='git svn handling of root commits in merge ranges'
 . ./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 'test handling of root commits in merge ranges' '
        mkdir -p init/trunk init/branches init/tags &&
        echo "r1" > init/trunk/file.txt &&