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
This commit is contained in:
@ -2,6 +2,14 @@
|
|||||||
test_description='git svn handling of root commits in merge ranges'
|
test_description='git svn handling of root commits in merge ranges'
|
||||||
. ./lib-git-svn.sh
|
. ./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' '
|
test_expect_success 'test handling of root commits in merge ranges' '
|
||||||
mkdir -p init/trunk init/branches init/tags &&
|
mkdir -p init/trunk init/branches init/tags &&
|
||||||
echo "r1" > init/trunk/file.txt &&
|
echo "r1" > init/trunk/file.txt &&
|
||||||
|
Reference in New Issue
Block a user