3 # Description of the files in the repository:
7 # Imported once. 1.1 and 1.1.1.1 should be identical.
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
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 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
36 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
40 setup_cvs_test_repository t9601
42 test_expect_success PERL 'import a module with a vendor branch' '
44 git cvsimport -C module-git module
48 test_expect_success PERL 'check HEAD out of cvs repository' 'test_cvs_co main'
50 test_expect_success PERL 'check main out of git repository' 'test_git_co main'
52 test_expect_success PERL 'check a file that was imported once' '
54 test_cmp_branch_file main imported-once.txt
58 test_expect_failure PERL 'check a file that was imported twice' '
60 test_cmp_branch_file main imported-twice.txt
64 test_expect_success PERL 'check a file that was imported then modified on HEAD' '
66 test_cmp_branch_file main imported-modified.txt
70 test_expect_success PERL 'check a file that was imported, modified, then imported again' '
72 test_cmp_branch_file main imported-modified-imported.txt
76 test_expect_success PERL 'check a file that was added to HEAD then imported' '
78 test_cmp_branch_file main added-imported.txt
82 test_expect_success PERL 'a vendor branch whose tag has been removed' '
84 test_cmp_branch_file main imported-anonymously.txt