Skip to content

Commit 8371e91

Browse files
committed
Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6
* rj/maint-t9159-svn-rev-notation: t9159-*.sh: skip for mergeinfo test for svn <= 1.4
2 parents 1f7a2ab + e29bee1 commit 8371e91

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

t/t9159-git-svn-no-parent-mergeinfo.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
test_description='git svn handling of root commits in merge ranges'
33
. ./lib-git-svn.sh
44

5+
svn_ver="$(svn --version --quiet)"
6+
case $svn_ver in
7+
0.* | 1.[0-4].*)
8+
skip_all="skipping git-svn test - SVN too old ($svn_ver)"
9+
test_done
10+
;;
11+
esac
12+
513
test_expect_success 'test handling of root commits in merge ranges' '
614
mkdir -p init/trunk init/branches init/tags &&
715
echo "r1" > init/trunk/file.txt &&

0 commit comments

Comments
 (0)