# # # add_dir "tests/importing_cvs_cycle_splitter4" # # add_dir "tests/importing_cvs_cycle_splitter4/cvs-repository" # # add_dir "tests/importing_cvs_cycle_splitter4/cvs-repository/test" # # add_file "tests/importing_cvs_cycle_splitter4/__driver__.lua" # content [eaca3c39813695e48b739290346ce5cc912d02a0] # # add_file "tests/importing_cvs_cycle_splitter4/cvs-repository/test/file1,v" # content [a2b82e6c47546d030b2c4ec74f76ba77e6719cba] # # add_file "tests/importing_cvs_cycle_splitter4/cvs-repository/test/file2,v" # content [710b5d860eb5e684995bf9107a1ae0663d0315cb] # # add_file "tests/importing_cvs_cycle_splitter4/cvs-repository/test/file3,v" # content [6192a8426464f6918d5e7cbc23acd2fc53502bd7] # ============================================================ --- tests/importing_cvs_cycle_splitter4/__driver__.lua eaca3c39813695e48b739290346ce5cc912d02a0 +++ tests/importing_cvs_cycle_splitter4/__driver__.lua eaca3c39813695e48b739290346ce5cc912d02a0 @@ -0,0 +1,18 @@ + +mtn_setup() + +check(get("cvs-repository")) + +-- A carefully handcrafted CVS repository, exercising the cycle splitter: We +-- have three files and some pretty nasty cyclic dependencies: +-- +-- fileA: A -> B -> C +-- file2: B -> C -> A +-- file3: C -> A -> B +-- +-- Currently, this test fails because it creates a cycle with only type4 +-- events (i.e. no single blob can be split to resolve the cycle). + +-- import into monotone and check presence of files +xfail(mtn("--branch=test", "cvs_import", "--debug", "cvs-repository/test"), 0, false, false) + ============================================================ --- tests/importing_cvs_cycle_splitter4/cvs-repository/test/file1,v a2b82e6c47546d030b2c4ec74f76ba77e6719cba +++ tests/importing_cvs_cycle_splitter4/cvs-repository/test/file1,v a2b82e6c47546d030b2c4ec74f76ba77e6719cba @@ -0,0 +1,58 @@ +head 1.3; +access; +symbols; +locks; strict; +comment @# @; + + +1.3 +date 2008.03.01.00.00.00; author markus; state Exp; +branches; +next 1.2; + +1.2 +date 2008.02.01.00.00.00; author markus; state Exp; +branches; +next 1.1; + +1.1 +date 2008.01.01.00.00.00; author markus; state Exp; +branches; +next ; + + +desc +@@ + + +1.3 +log address@hidden C +@ +text address@hidden 1.3 of test file1 +@ + + +1.2 +log address@hidden B +@ +text address@hidden 1 +a1 1 +version 1.2 of test file1 +@ + + +1.1 +log address@hidden A +@ +text address@hidden 1 +a1 1 +version 1.1 of test file1 +@ + + ============================================================ --- tests/importing_cvs_cycle_splitter4/cvs-repository/test/file2,v 710b5d860eb5e684995bf9107a1ae0663d0315cb +++ tests/importing_cvs_cycle_splitter4/cvs-repository/test/file2,v 710b5d860eb5e684995bf9107a1ae0663d0315cb @@ -0,0 +1,58 @@ +head 1.3; +access; +symbols; +locks; strict; +comment @# @; + + +1.3 +date 2008.03.01.00.00.00; author markus; state Exp; +branches; +next 1.2; + +1.2 +date 2008.02.01.00.00.00; author markus; state Exp; +branches; +next 1.1; + +1.1 +date 2008.01.01.00.00.00; author markus; state Exp; +branches; +next ; + + +desc +@@ + + +1.3 +log address@hidden A +@ +text address@hidden 1.3 of test file2 +@ + + +1.2 +log address@hidden C +@ +text address@hidden 1 +a1 1 +version 1.2 of test file2 +@ + + +1.1 +log address@hidden B +@ +text address@hidden 1 +a1 1 +version 1.1 of test file2 +@ + + ============================================================ --- tests/importing_cvs_cycle_splitter4/cvs-repository/test/file3,v 6192a8426464f6918d5e7cbc23acd2fc53502bd7 +++ tests/importing_cvs_cycle_splitter4/cvs-repository/test/file3,v 6192a8426464f6918d5e7cbc23acd2fc53502bd7 @@ -0,0 +1,58 @@ +head 1.3; +access; +symbols; +locks; strict; +comment @# @; + + +1.3 +date 2008.03.01.00.00.00; author markus; state Exp; +branches; +next 1.2; + +1.2 +date 2008.02.01.00.00.00; author markus; state Exp; +branches; +next 1.1; + +1.1 +date 2008.01.01.00.00.00; author markus; state Exp; +branches; +next ; + + +desc +@@ + + +1.3 +log address@hidden B +@ +text address@hidden 1.3 of test file2 +@ + + +1.2 +log address@hidden A +@ +text address@hidden 1 +a1 1 +version 1.2 of test file2 +@ + + +1.1 +log address@hidden C +@ +text address@hidden 1 +a1 1 +version 1.1 of test file2 +@ + +