merge-recursive: demonstrate an incorrect conflict with submodule
[git/dscho.git] / t / t9602-cvsimport-branches-tags.sh
blob67878b2d0ce2003e761dbd3e72a699f6e4fa56c7
1 #!/bin/sh
3 # A description of the repository used for this test can be found in
4 # t9602/README.
6 test_description='git cvsimport handling of branches and tags'
7 . ./lib-cvs.sh
9 CVSROOT="$TEST_DIRECTORY"/t9602/cvsroot
10 export CVSROOT
12 test_expect_success 'import module' '
14 git cvsimport -C module-git module
18 test_expect_success 'test branch master' '
20 test_cmp_branch_tree master
24 test_expect_success 'test branch vendorbranch' '
26 test_cmp_branch_tree vendorbranch
30 test_expect_failure 'test branch B_FROM_INITIALS' '
32 test_cmp_branch_tree B_FROM_INITIALS
36 test_expect_failure 'test branch B_FROM_INITIALS_BUT_ONE' '
38 test_cmp_branch_tree B_FROM_INITIALS_BUT_ONE
42 test_expect_failure 'test branch B_MIXED' '
44 test_cmp_branch_tree B_MIXED
48 test_expect_success 'test branch B_SPLIT' '
50 test_cmp_branch_tree B_SPLIT
54 test_expect_failure 'test tag vendortag' '
56 test_cmp_branch_tree vendortag
60 test_expect_success 'test tag T_ALL_INITIAL_FILES' '
62 test_cmp_branch_tree T_ALL_INITIAL_FILES
66 test_expect_failure 'test tag T_ALL_INITIAL_FILES_BUT_ONE' '
68 test_cmp_branch_tree T_ALL_INITIAL_FILES_BUT_ONE
72 test_expect_failure 'test tag T_MIXED' '
74 test_cmp_branch_tree T_MIXED
79 test_done