t4026 (color): remove unneeded and unchained command
[git/dscho.git] / t / t9601-cvsimport-vendor-branch.sh
blob827d39f5bf28652cc3d9fdf2f331592ed0b46ecc
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 setup_cvs_test_repository t9601
39 test_expect_success PERL 'import a module with a vendor branch' '
41 git cvsimport -C module-git module
45 test_expect_success PERL 'check HEAD out of cvs repository' 'test_cvs_co master'
47 test_expect_success PERL 'check master out of git repository' 'test_git_co master'
49 test_expect_success PERL 'check a file that was imported once' '
51 test_cmp_branch_file master imported-once.txt
55 test_expect_failure PERL 'check a file that was imported twice' '
57 test_cmp_branch_file master imported-twice.txt
61 test_expect_success PERL 'check a file that was imported then modified on HEAD' '
63 test_cmp_branch_file master imported-modified.txt
67 test_expect_success PERL 'check a file that was imported, modified, then imported again' '
69 test_cmp_branch_file master imported-modified-imported.txt
73 test_expect_success PERL 'check a file that was added to HEAD then imported' '
75 test_cmp_branch_file master added-imported.txt
79 test_expect_success PERL 'a vendor branch whose tag has been removed' '
81 test_cmp_branch_file master imported-anonymously.txt
85 test_done