diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:12:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:12:13 -0700 |
| commit | 8371e91463d8d9507244952f1652f2c1e0779a84 (patch) | |
| tree | 46eaf0160d00528e42c8ffdd3ea8bec0a3821d12 | |
| parent | 1f7a2abcc18ec1080905dc5cd59381f7ac1c8111 (diff) | |
| parent | e29bee19012d6aa4fb02dae727caa53947d9e39a (diff) | |
| download | git-8371e91463d8d9507244952f1652f2c1e0779a84.tar.gz | |
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
| -rwxr-xr-x | t/t9159-git-svn-no-parent-mergeinfo.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t9159-git-svn-no-parent-mergeinfo.sh b/t/t9159-git-svn-no-parent-mergeinfo.sh index 85120b70db..69e4815781 100755 --- 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 && |