diff options
| author |  Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2011-09-10 18:40:10 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-09-21 11:59:33 -0700 |
| commit | e29bee19012d6aa4fb02dae727caa53947d9e39a (patch) | |
| tree | c7f8822fe62b656182c24f9987f09f1029835f70 | |
| parent | Git 1.7.6.2 (diff) | |
| download | tgif-e29bee19012d6aa4fb02dae727caa53947d9e39a.tar.xz | |
t9159-*.sh: skip for mergeinfo test for svn <= 1.4
t9159 relies on the command-line syntax of svn >= 1.5. Given the
declining install base of older svn versions, it is not worth our time to
support older svn syntax.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 && |