# # # add_dir "tests/importing_cvs_with_multiple_unnamed_branches" # # add_dir "tests/importing_cvs_with_multiple_unnamed_branches/e" # # add_file "tests/importing_cvs_with_multiple_unnamed_branches/__driver__.lua" # content [55f4ec6dbadb7e4299a2eb95040514aa9057e046] # # add_file "tests/importing_cvs_with_multiple_unnamed_branches/e/fileA,v" # content [9988662090c9cfcde1de88beb606684bfb156f10] # # patch "testsuite.lua" # from [5d58ac45d0fba225aefecc787a26d44dacdc97eb] # to [030874b8c5f8e0bc3cec97118fd92f90e14fbaad] # ============================================================ --- tests/importing_cvs_with_multiple_unnamed_branches/__driver__.lua 55f4ec6dbadb7e4299a2eb95040514aa9057e046 +++ tests/importing_cvs_with_multiple_unnamed_branches/__driver__.lua 55f4ec6dbadb7e4299a2eb95040514aa9057e046 @@ -0,0 +1,14 @@ + +mtn_setup() + +check(get("e")) + +check(mtn("--branch=test", "cvs_import", "e"), 0, false, false) + +check(mtn("list", "branches"), 0, true, false) +check(samelines("stdout", {"test", "test.BRANCH_FROM_UNNAMED_BRANCH_A", "test.BRANCH_FROM_UNNAMED_BRANCH_B"})) + +check(mtn("--branch=test.BRANCH_FROM_UNNAMED_BRANCH", "co", "mtnco")) +check(indir("mtnco", mtn("list", "known")), 0, true) +check(samelines("stdout", {"fileA"})) +check(samelines("mtnco/fileA", {"revision 3 of fileA"})) ============================================================ --- tests/importing_cvs_with_multiple_unnamed_branches/e/fileA,v 9988662090c9cfcde1de88beb606684bfb156f10 +++ tests/importing_cvs_with_multiple_unnamed_branches/e/fileA,v 9988662090c9cfcde1de88beb606684bfb156f10 @@ -0,0 +1,101 @@ +head 1.1; +access; +symbols + BRANCH_FROM_UNNAMED_BRANCH_B:1.1.2.1.2.1.2.1.0.2 + BRANCH_FROM_UNNAMED_BRANCH_A:1.1.2.1.0.2; +locks; strict; +comment @# @; + + +1.1 +date 2006.12.13.19.12.21; author markus; state Exp; +branches + 1.1.2.1; +next ; +commitid Wsa2fgIB3bZ8BoYr; + +1.1.2.1 +date 2006.12.13.19.12.22; author markus; state Exp; +branches + 1.1.2.1.2.1; +next ; +commitid oEj0XhV2lyy9BoYr; + +1.1.2.1.2.1 +date 2006.12.13.19.12.23; author markus; state Exp; +branches + 1.1.2.1.2.1.2.1; +next ; +commitid WpRjzOJTXPQ9BoYr; + +1.1.2.1.2.1.2.1 +date 2006.12.13.19.12.24; author markus; state Exp; +branches + 1.1.2.1.2.1.2.1.2.1; +next ; +commitid TTp9SPnJULcaBoYr; + +1.1.2.1.2.1.2.1.2.1 +date 2006.12.13.19.12.25; author markus; state Exp; +branches; +next ; +commitid AE70kVJxSEqaBoYr; + + +desc +@@ + + +1.1 +log address@hidden versions +@ +text address@hidden revision of fileA +@ + + +1.1.2.1 +log address@hidden 2 of fileA +@ +text address@hidden 1 +a1 1 +revision 2 of fileA +@ + + +1.1.2.1.2.1 +log address@hidden 3 of fileA +@ +text address@hidden 1 +a1 1 +revision 3 of fileA +@ + + +1.1.2.1.2.1.2.1 +log address@hidden 4 of fileA +@ +text address@hidden 1 +a1 1 +revision 4 of fileA +@ + + +1.1.2.1.2.1.2.1.2.1 +log address@hidden 5 of fileA +@ +text address@hidden 1 +a1 1 +revision 5 of fileA +@ + + ============================================================ --- testsuite.lua 5d58ac45d0fba225aefecc787a26d44dacdc97eb +++ testsuite.lua 030874b8c5f8e0bc3cec97118fd92f90e14fbaad @@ -702,3 +702,4 @@ table.insert(tests, "importing_cvs_with_ table.insert(tests, "importing_cvs_branch_from_empty_branch") table.insert(tests, "importing_cvs_with_unnamed_branch") table.insert(tests, "importing_cvs_with_missing_delta") +table.insert(tests, "importing_cvs_with_multiple_unnamed_branches")