# # # add_dir "tests/importing_cvs_cycle_splitter5" # # add_dir "tests/importing_cvs_cycle_splitter5/cvs-repository" # # add_dir "tests/importing_cvs_cycle_splitter5/cvs-repository/test" # # add_file "tests/importing_cvs_cycle_splitter5/__driver__.lua" # content [7eb456f6560f78cea0266b97047649b1a683352b] # # add_file "tests/importing_cvs_cycle_splitter5/cvs-repository/test/file1,v" # content [c65ccf8a3f4faf2cd9ed0e33325670fbb9cd6afe] # # add_file "tests/importing_cvs_cycle_splitter5/cvs-repository/test/file1b,v" # content [dca8b9c704579e008cfac64751970f8edb317c7a] # # add_file "tests/importing_cvs_cycle_splitter5/cvs-repository/test/file1c,v" # content [624014a7f21f1f5c95c95e2e7f8bf00a4179e36d] # # add_file "tests/importing_cvs_cycle_splitter5/cvs-repository/test/file2,v" # content [e5141f1ffe30b872a2379304f2f08b8a8c027248] # # add_file "tests/importing_cvs_cycle_splitter5/cvs-repository/test/file2b,v" # content [5905bdaa79d171faa34c61fe143634969fdcc09e] # # add_file "tests/importing_cvs_cycle_splitter5/cvs-repository/test/file2c,v" # content [1d853085a3b8723b40e8e17bdd86ee51530f61bf] # # add_file "tests/importing_cvs_cycle_splitter5/cvs-repository/test/file3,v" # content [4c0e3f3bb313ec571a00cfbf5ed50c14024489d1] # # add_file "tests/importing_cvs_cycle_splitter5/cvs-repository/test/file3b,v" # content [e8d1eb497d0265e0c7e966a2a6dfa2611c19737d] # # add_file "tests/importing_cvs_cycle_splitter5/cvs-repository/test/file3c,v" # content [fff4148f81586257ed6fecf21f5fd17bde5abb0e] # ============================================================ --- tests/importing_cvs_cycle_splitter5/__driver__.lua 7eb456f6560f78cea0266b97047649b1a683352b +++ tests/importing_cvs_cycle_splitter5/__driver__.lua 7eb456f6560f78cea0266b97047649b1a683352b @@ -0,0 +1,15 @@ + +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 + +-- 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_splitter5/cvs-repository/test/file1,v c65ccf8a3f4faf2cd9ed0e33325670fbb9cd6afe +++ tests/importing_cvs_cycle_splitter5/cvs-repository/test/file1,v c65ccf8a3f4faf2cd9ed0e33325670fbb9cd6afe @@ -0,0 +1,44 @@ +head 1.2; +access; +symbols; +locks; strict; +comment @# @; + + +1.2 +date 2008.01.01.12.10.00; author markus; state Exp; +branches; +next 1.1; + +1.1 +date 2008.01.01.12.00.00; author markus; state Exp; +branches; +next ; + + +desc +@@ + + +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_splitter5/cvs-repository/test/file1b,v dca8b9c704579e008cfac64751970f8edb317c7a +++ tests/importing_cvs_cycle_splitter5/cvs-repository/test/file1b,v dca8b9c704579e008cfac64751970f8edb317c7a @@ -0,0 +1,44 @@ +head 1.2; +access; +symbols; +locks; strict; +comment @# @; + + +1.2 +date 2008.01.01.12.40.00; author markus; state Exp; +branches; +next 1.1; + +1.1 +date 2008.01.01.12.30.00; author markus; state Exp; +branches; +next ; + + +desc +@@ + + +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_splitter5/cvs-repository/test/file1c,v 624014a7f21f1f5c95c95e2e7f8bf00a4179e36d +++ tests/importing_cvs_cycle_splitter5/cvs-repository/test/file1c,v 624014a7f21f1f5c95c95e2e7f8bf00a4179e36d @@ -0,0 +1,28 @@ +head 1.1; +access; +symbols; +locks; strict; +comment @# @; + + +1.1 +date 2008.01.01.12.35.00; author markus; state Exp; +branches; +next ; + + +desc +@@ + + +1.1 +log address@hidden A +@ +text address@hidden 1 +a1 1 +version 1.1 of test file1 +@ + + ============================================================ --- tests/importing_cvs_cycle_splitter5/cvs-repository/test/file2,v e5141f1ffe30b872a2379304f2f08b8a8c027248 +++ tests/importing_cvs_cycle_splitter5/cvs-repository/test/file2,v e5141f1ffe30b872a2379304f2f08b8a8c027248 @@ -0,0 +1,44 @@ +head 1.2; +access; +symbols; +locks; strict; +comment @# @; + + +1.2 +date 2008.01.01.12.20.00; author markus; state Exp; +branches; +next 1.1; + +1.1 +date 2008.01.01.12.10.00; author markus; state Exp; +branches; +next ; + + +desc +@@ + + +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_splitter5/cvs-repository/test/file2b,v 5905bdaa79d171faa34c61fe143634969fdcc09e +++ tests/importing_cvs_cycle_splitter5/cvs-repository/test/file2b,v 5905bdaa79d171faa34c61fe143634969fdcc09e @@ -0,0 +1,44 @@ +head 1.2; +access; +symbols; +locks; strict; +comment @# @; + + +1.2 +date 2008.01.01.12.50.00; author markus; state Exp; +branches; +next 1.1; + +1.1 +date 2008.01.01.12.40.00; author markus; state Exp; +branches; +next ; + + +desc +@@ + + +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_splitter5/cvs-repository/test/file2c,v 1d853085a3b8723b40e8e17bdd86ee51530f61bf +++ tests/importing_cvs_cycle_splitter5/cvs-repository/test/file2c,v 1d853085a3b8723b40e8e17bdd86ee51530f61bf @@ -0,0 +1,28 @@ +head 1.1; +access; +symbols; +locks; strict; +comment @# @; + + +1.1 +date 2008.01.01.12.45.00; author markus; state Exp; +branches; +next ; + + +desc +@@ + + +1.1 +log address@hidden B +@ +text address@hidden 1 +a1 1 +version 1.1 of test file2 +@ + + ============================================================ --- tests/importing_cvs_cycle_splitter5/cvs-repository/test/file3,v 4c0e3f3bb313ec571a00cfbf5ed50c14024489d1 +++ tests/importing_cvs_cycle_splitter5/cvs-repository/test/file3,v 4c0e3f3bb313ec571a00cfbf5ed50c14024489d1 @@ -0,0 +1,44 @@ +head 1.2; +access; +symbols; +locks; strict; +comment @# @; + + +1.2 +date 2008.01.01.12.30.00; author markus; state Exp; +branches; +next 1.1; + +1.1 +date 2008.01.01.12.20.00; author markus; state Exp; +branches; +next ; + + +desc +@@ + + +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 +@ + + ============================================================ --- tests/importing_cvs_cycle_splitter5/cvs-repository/test/file3b,v e8d1eb497d0265e0c7e966a2a6dfa2611c19737d +++ tests/importing_cvs_cycle_splitter5/cvs-repository/test/file3b,v e8d1eb497d0265e0c7e966a2a6dfa2611c19737d @@ -0,0 +1,44 @@ +head 1.2; +access; +symbols; +locks; strict; +comment @# @; + + +1.2 +date 2008.01.01.12.59.00; author markus; state Exp; +branches; +next 1.1; + +1.1 +date 2008.01.01.12.50.00; author markus; state Exp; +branches; +next ; + + +desc +@@ + + +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 +@ + + ============================================================ --- tests/importing_cvs_cycle_splitter5/cvs-repository/test/file3c,v fff4148f81586257ed6fecf21f5fd17bde5abb0e +++ tests/importing_cvs_cycle_splitter5/cvs-repository/test/file3c,v fff4148f81586257ed6fecf21f5fd17bde5abb0e @@ -0,0 +1,28 @@ +head 1.1; +access; +symbols; +locks; strict; +comment @# @; + + +1.1 +date 2008.01.01.12.55.00; author markus; state Exp; +branches; +next ; + + +desc +@@ + + +1.1 +log address@hidden C +@ +text address@hidden 1 +a1 1 +version 1.1 of test file2 +@ + +