summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9cfdbf9)
raw | patch | inline | side by side (parent: 9cfdbf9)
author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | |
Thu, 6 Jan 2011 18:29:23 +0000 (18:29 +0000) | ||
committer | Eric Wong <normalperson@yhbt.net> | |
Fri, 7 Jan 2011 22:14:36 +0000 (22:14 +0000) |
Acked-by: Eric Wong <normalperson@yhbt.net>
Acked-by: Steven Walter <stevenrwalter@gmail.com>
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Steven Walter <stevenrwalter@gmail.com>
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
t/t9157-git-svn-fetch-merge.sh | patch | blob | history |
index da582c53825a5719f6c9d82983e0951afcccd0df..accf61eb03c482e72cef7c8810c47bef5b985394 100755 (executable)
test_description='git svn merge detection'
. ./lib-git-svn.sh
+svn_ver="$(svn --version --quiet)"
+case $svn_ver in
+[0-1].[0-4].[0-6])
+ skip_all="skipping git-svn test - SVN too old ($svn_ver)"
+ test_done
+ ;;
+esac
+
test_expect_success 'initialize source svn repo' '
svn_cmd mkdir -m x "$svnrepo"/trunk &&
svn_cmd mkdir -m x "$svnrepo"/branches &&