# # # add_dir "tests/importing_cvs_cycle_splitter2" # # add_dir "tests/importing_cvs_cycle_splitter2/cvs-repository" # # add_dir "tests/importing_cvs_cycle_splitter2/cvs-repository/test" # # add_file "tests/importing_cvs_cycle_splitter2/__driver__.lua" # content [da20a380985f7e5b6cbca9c9699331724347a33b] # # add_file "tests/importing_cvs_cycle_splitter2/cvs-repository/test/bar,v" # content [e96da8f102e43d0f1a1c9b75a3a7b54d097cc734] # # add_file "tests/importing_cvs_cycle_splitter2/cvs-repository/test/foo,v" # content [96520c5cd80f62c383e4683c44d62963de16ca4a] # ============================================================ --- tests/importing_cvs_cycle_splitter2/__driver__.lua da20a380985f7e5b6cbca9c9699331724347a33b +++ tests/importing_cvs_cycle_splitter2/__driver__.lua da20a380985f7e5b6cbca9c9699331724347a33b @@ -0,0 +1,33 @@ + +mtn_setup() + +-- Test splitting a normal cycle: +-- +-- A -> B -> C +-- ^ | +-- | | +-- +---------+ +-- +-- This time, as opposed to the cycle_splitter1 test, the last commit +-- on file bar, i.e. blob A, has manually been 'adjusted' to carry the +-- very same timestamp (and commit id) as the commit of file foo in +-- blob A. Thus blob A looks very much like all other blobs: all events +-- carry the very same timestamp. Thus it's not possible to split by +-- the largest gap. +-- +-- To solve this, the importer would have to adjust the timestamps of +-- the single files, before attempting to split cycles. + + +-- See makerepo.sh on how this repository was created. +check(get("cvs-repository")) + +-- import into monotone +xfail(mtn("--branch=testbranch", "cvs_import", "cvs-repository/test"), 0, false, false) + +-- check for correct ordering of the commits +check(mtn("checkout", "--branch=testbranch", "mtcodir"), 0, false, false) +check(indir("mtcodir", mtn("log", "--no-graph", "--no-files")), 0, true, false) +check(grep("blob", "stdout"), 0, true, false) +check(samelines("stdout", {"blob A", "blob C", "blob B", "blob A"})) + ============================================================ --- tests/importing_cvs_cycle_splitter2/cvs-repository/test/bar,v e96da8f102e43d0f1a1c9b75a3a7b54d097cc734 +++ tests/importing_cvs_cycle_splitter2/cvs-repository/test/bar,v e96da8f102e43d0f1a1c9b75a3a7b54d097cc734 @@ -0,0 +1,77 @@ +head 1.4; +access; +symbols; +locks; strict; +comment @# @; + + +1.4 +date 2007.08.11.11.39.16; author markus; state Exp; +branches; +next 1.3; +commitid DxQVVIrydxbqlkts; + +1.3 +date 2007.08.11.11.39.18; author markus; state Exp; +branches; +next 1.2; +commitid lkjfjlFj3m3rlkts; + +1.2 +date 2007.08.11.11.39.17; author markus; state Exp; +branches; +next 1.1; +commitid mnMQpnbr3DJqlkts; + +1.1 +date 2007.08.11.11.39.15; author markus; state Exp; +branches; +next ; +commitid BIo6UxgR1xTplkts; + + +desc +@@ + + +1.4 +log address@hidden A +@ +text address@hidden 1.4 of test file bar +@ + + +1.3 +log address@hidden C +@ +text address@hidden 1 +a1 1 +version 1.3 of test file bar +@ + + +1.2 +log address@hidden B +@ +text address@hidden 1 +a1 1 +version 1.2 of test file bar +@ + + +1.1 +log address@hidden import +@ +text address@hidden 1 +a1 1 +version 1.1 of test file bar +@ + ============================================================ --- tests/importing_cvs_cycle_splitter2/cvs-repository/test/foo,v 96520c5cd80f62c383e4683c44d62963de16ca4a +++ tests/importing_cvs_cycle_splitter2/cvs-repository/test/foo,v 96520c5cd80f62c383e4683c44d62963de16ca4a @@ -0,0 +1,77 @@ +head 1.4; +access; +symbols; +locks; strict; +comment @# @; + + +1.4 +date 2007.08.11.11.39.18; author markus; state Exp; +branches; +next 1.3; +commitid lkjfjlFj3m3rlkts; + +1.3 +date 2007.08.11.11.39.17; author markus; state Exp; +branches; +next 1.2; +commitid mnMQpnbr3DJqlkts; + +1.2 +date 2007.08.11.11.39.16; author markus; state Exp; +branches; +next 1.1; +commitid DxQVVIrydxbqlkts; + +1.1 +date 2007.08.11.11.39.15; author markus; state Exp; +branches; +next ; +commitid BIo6UxgR1xTplkts; + + +desc +@@ + + +1.4 +log address@hidden C +@ +text address@hidden 1.4 of test file foo +@ + + +1.3 +log address@hidden B +@ +text address@hidden 1 +a1 1 +version 1.3 of test file foo +@ + + +1.2 +log address@hidden A +@ +text address@hidden 1 +a1 1 +version 1.2 of test file foo +@ + + +1.1 +log address@hidden import +@ +text address@hidden 1 +a1 1 +version 1.1 of test file foo +@ +