aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-01-05 13:34:43 -0800
committerJunio C Hamano <gitster@pobox.com>2011-01-05 13:34:43 -0800
commitbf9b46c16d28c0e1f938947a98ca518f9644b0c0 (patch)
treea17f382126beca078b1d43028701ff1cb010c744 /t
parentd3cae60efcf28e3d498423b9d11dd772d424ddc9 (diff)
parentb3e5bce1aa88721dd4565089960997836ce66add (diff)
downloadgit-bf9b46c16d28c0e1f938947a98ca518f9644b0c0.tar.gz
git-bf9b46c16d28c0e1f938947a98ca518f9644b0c0.tar.xz
Merge branch 'jn/svn-fe' (early part)
* 'jn/svn-fe' (early part): vcs-svn: Error out for v3 dumps Conflicts: t/t9010-svn-fe.sh
Diffstat (limited to 't')
-rwxr-xr-xt/t9010-svn-fe.sh59
1 files changed, 37 insertions, 22 deletions
diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh
index faf909296..c96bf2f5c 100755
--- a/t/t9010-svn-fe.sh
+++ b/t/t9010-svn-fe.sh
@@ -20,29 +20,44 @@ svn_cmd () {
svn "$subcommand" --config-dir "$svnconf" "$@"
}
-test_dump () {
- label=$1
- dump=$2
- test_expect_success "$dump" '
- svnadmin create "$label-svn" &&
- svnadmin load "$label-svn" < "$TEST_DIRECTORY/$dump" &&
- svn_cmd export "file://$PWD/$label-svn" "$label-svnco" &&
- git init "$label-git" &&
- test-svn-fe "$TEST_DIRECTORY/$dump" >"$label.fe" &&
- (
- cd "$label-git" &&
- git fast-import < ../"$label.fe"
- ) &&
- (
- cd "$label-svnco" &&
- git init &&
- git add . &&
- git fetch "../$label-git" master &&
- git diff --exit-code FETCH_HEAD
- )
- '
+reinit_git () {
+ rm -fr .git &&
+ git init
}
-test_dump simple t9135/svn.dump
+>empty
+
+test_expect_success 'empty dump' '
+ reinit_git &&
+ echo "SVN-fs-dump-format-version: 2" >input &&
+ test-svn-fe input >stream &&
+ git fast-import <stream
+'
+
+test_expect_success 'v3 dumps not supported' '
+ reinit_git &&
+ echo "SVN-fs-dump-format-version: 3" >input &&
+ test_must_fail test-svn-fe input >stream &&
+ test_cmp empty stream
+'
+
+test_expect_success 't9135/svn.dump' '
+ svnadmin create simple-svn &&
+ svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" &&
+ svn_cmd export "file://$PWD/simple-svn" simple-svnco &&
+ git init simple-git &&
+ test-svn-fe "$TEST_DIRECTORY/t9135/svn.dump" >simple.fe &&
+ (
+ cd simple-git &&
+ git fast-import <../simple.fe
+ ) &&
+ (
+ cd simple-svnco &&
+ git init &&
+ git add . &&
+ git fetch ../simple-git master &&
+ git diff --exit-code FETCH_HEAD
+ )
+'
test_done