# # # add_dir "tests/importing_cvs_with_unnamed_branch" # # add_dir "tests/importing_cvs_with_unnamed_branch/e" # # add_file "tests/importing_cvs_with_unnamed_branch/__driver__.lua" # content [68eece2bd427db3e54b1cdbcedc975adbd6283d1] # # add_file "tests/importing_cvs_with_unnamed_branch/e/fileA,v" # content [46f12ac08467e1071cb6cd8ddeca7efeb75801a2] # # patch "testsuite.lua" # from [a6be465ee9616d5e7dac08299924d53798deeba9] # to [938471ae83532d8391d491bb7090f511bc9ce64c] # ============================================================ --- tests/importing_cvs_with_unnamed_branch/__driver__.lua 68eece2bd427db3e54b1cdbcedc975adbd6283d1 +++ tests/importing_cvs_with_unnamed_branch/__driver__.lua 68eece2bd427db3e54b1cdbcedc975adbd6283d1 @@ -0,0 +1,14 @@ + +mtn_setup() + +check(get("e")) + +check(mtn("--branch=test", "--debug", "cvs_import", "e"), 0, false, false) + +check(mtn("list", "branches"), 0, true, false) +check(samelines("stdout", {"test", "test.BRANCH_FROM_UNNAMED_BRANCH"})) + +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", {"1.3"})) ============================================================ --- tests/importing_cvs_with_unnamed_branch/e/fileA,v 46f12ac08467e1071cb6cd8ddeca7efeb75801a2 +++ tests/importing_cvs_with_unnamed_branch/e/fileA,v 46f12ac08467e1071cb6cd8ddeca7efeb75801a2 @@ -0,0 +1,64 @@ +head 1.1; +access; +symbols + BRANCH_FROM_UNNAMED_BRANCH:1.1.2.1.0.2; +locks; strict; +comment @# @; + + +1.1 +date 2006.12.13.11.12.33; author markus; state Exp; +branches + 1.1.2.1; +next ; +commitid On3UHQIcoaQxWlYr; + +1.1.2.1 +date 2006.12.13.11.12.34; author markus; state Exp; +branches + 1.1.2.1.2.1; +next ; +commitid Eidt7nSRG57yWlYr; + +1.1.2.1.2.1 +date 2006.12.13.11.12.35; author markus; state Exp; +branches; +next ; +commitid wprIv5MVOAzyWlYr; + + +desc +@@ + + +1.1 +log address@hidden versions +@ +text address@hidden +@ + + +1.1.2.1 +log address@hidden 1.2 of fileA +@ +text address@hidden 1 +a1 1 +1.2 +@ + + +1.1.2.1.2.1 +log address@hidden 1.3 of fileA +@ +text address@hidden 1 +a1 1 +1.3 +@ + + ============================================================ --- testsuite.lua a6be465ee9616d5e7dac08299924d53798deeba9 +++ testsuite.lua 938471ae83532d8391d491bb7090f511bc9ce64c @@ -700,3 +700,4 @@ table.insert(tests, "importing_cvs_branc table.insert(tests, "importing_cvs_with_conflicting_tag") table.insert(tests, "importing_cvs_with_tags_after_delete") table.insert(tests, "importing_cvs_branch_from_empty_branch") +table.insert(tests, "importing_cvs_with_unnamed_branch")