diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:26 -0700 |
| commit | 18445fdfd3bba554602f28c7f2cfb83f8462e8c9 (patch) | |
| tree | ed3f2feec62fa7511660da2adf058b03cfffa75c | |
| parent | 9a33b691aaaae995b2da65a08d927c31106c8a3d (diff) | |
| parent | e29bee19012d6aa4fb02dae727caa53947d9e39a (diff) | |
| download | git-18445fdfd3bba554602f28c7f2cfb83f8462e8c9.tar.gz git-18445fdfd3bba554602f28c7f2cfb83f8462e8c9.tar.xz | |
Merge branch 'rj/maint-t9159-svn-rev-notation'
* 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 85120b70d..69e481578 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 && |