mirror of
https://github.com/git/git.git
synced 2024-11-24 18:33:43 +08:00
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:
commit
8371e91463
@ -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 &&
|
||||
|
Loading…
Reference in New Issue
Block a user