Clarify and correct -z
[git/dscho.git] / t / t9601-cvsimport-vendor-branch.sh
blob3afaf565267eaa3281d5957775e76cf6a0d5f1b0
1 #!/bin/sh
3 # Description of the files in the repository:
5 # imported-once.txt:
7 # Imported once. 1.1 and 1.1.1.1 should be identical.
9 # imported-twice.txt:
11 # Imported twice. HEAD should reflect the contents of the
12 # second import (i.e., have the same contents as 1.1.1.2).
14 # imported-modified.txt:
16 # Imported, then modified on HEAD. HEAD should reflect the
17 # modification.
19 # imported-modified-imported.txt:
21 # Imported, then modified on HEAD, then imported again.
23 # added-imported.txt,v:
25 # Added with 'cvs add' to create 1.1, then imported with
26 # completely different contents to create 1.1.1.1, therefore the
27 # vendor branch was never the default branch.
29 # imported-anonymously.txt:
31 # Like imported-twice.txt, but with a vendor branch whose branch
32 # tag has been removed.
34 test_description='git cvsimport handling of vendor branches'
35 . ./lib-cvs.sh
37 CVSROOT="$TEST_DIRECTORY"/t9601/cvsroot
38 export CVSROOT
40 test_expect_success 'import a module with a vendor branch' '
42 git cvsimport -C module-git module
46 test_expect_success 'check HEAD out of cvs repository' 'test_cvs_co master'
48 test_expect_success 'check master out of git repository' 'test_git_co master'
50 test_expect_success 'check a file that was imported once' '
52 test_cmp_branch_file master imported-once.txt
56 test_expect_failure 'check a file that was imported twice' '
58 test_cmp_branch_file master imported-twice.txt
62 test_expect_success 'check a file that was imported then modified on HEAD' '
64 test_cmp_branch_file master imported-modified.txt
68 test_expect_success 'check a file that was imported, modified, then imported again' '
70 test_cmp_branch_file master imported-modified-imported.txt
74 test_expect_success 'check a file that was added to HEAD then imported' '
76 test_cmp_branch_file master added-imported.txt
80 test_expect_success 'a vendor branch whose tag has been removed' '
82 test_cmp_branch_file master imported-anonymously.txt
86 test_done