#
#
# add_dir "tests/importing_cvs_cycle_splitter6"
# 
# add_dir "tests/importing_cvs_cycle_splitter6/cvs-repository"
# 
# add_dir "tests/importing_cvs_cycle_splitter6/cvs-repository/test"
# 
# add_file "tests/importing_cvs_cycle_splitter6/__driver__.lua"
#  content [893d23c08fdfdf6854cabc7fc555d9dc16865c28]
# 
# add_file "tests/importing_cvs_cycle_splitter6/cvs-repository/test/file1,v"
#  content [c65ccf8a3f4faf2cd9ed0e33325670fbb9cd6afe]
# 
# add_file "tests/importing_cvs_cycle_splitter6/cvs-repository/test/file1b,v"
#  content [dca8b9c704579e008cfac64751970f8edb317c7a]
# 
# add_file "tests/importing_cvs_cycle_splitter6/cvs-repository/test/file1c,v"
#  content [624014a7f21f1f5c95c95e2e7f8bf00a4179e36d]
# 
# add_file "tests/importing_cvs_cycle_splitter6/cvs-repository/test/file2,v"
#  content [e5141f1ffe30b872a2379304f2f08b8a8c027248]
# 
# add_file "tests/importing_cvs_cycle_splitter6/cvs-repository/test/file2b,v"
#  content [5905bdaa79d171faa34c61fe143634969fdcc09e]
# 
# add_file "tests/importing_cvs_cycle_splitter6/cvs-repository/test/file2c,v"
#  content [1fe7d3ffb90b8a003a096dcdad34800574f03697]
# 
# add_file "tests/importing_cvs_cycle_splitter6/cvs-repository/test/file3,v"
#  content [4c0e3f3bb313ec571a00cfbf5ed50c14024489d1]
# 
# add_file "tests/importing_cvs_cycle_splitter6/cvs-repository/test/file3b,v"
#  content [e8d1eb497d0265e0c7e966a2a6dfa2611c19737d]
# 
# add_file "tests/importing_cvs_cycle_splitter6/cvs-repository/test/file3c,v"
#  content [be67d185cec762161564e25e516bbc81c180a67d]
# 
# patch "tests/importing_cvs_cycle_splitter5/__driver__.lua"
#  from [6b6845c43162b61283d7937b4cb3dcb9c6317ae2]
#    to [b081f233e8076b698da31b33911eac6040276b20]
#
============================================================
--- tests/importing_cvs_cycle_splitter6/__driver__.lua	893d23c08fdfdf6854cabc7fc555d9dc16865c28
+++ tests/importing_cvs_cycle_splitter6/__driver__.lua	893d23c08fdfdf6854cabc7fc555d9dc16865c28
@@ -0,0 +1,28 @@
+
+mtn_setup()
+
+check(get("cvs-repository"))
+
+-- A carefully handcrafted CVS repository, exercising the cycle splitter: We
+-- have 2x three files and some pretty nasty cyclic dependencies:
+--
+--    file1:  A -> B -> C
+--    file2:       B -> C -> A
+--    file3:            C -> A -> B
+--    file1b: A -> B -> C
+--    file2b:      B -> C -> A
+--    file3b:           C -> A -> B
+--    file1c: A
+--    file2c:      B
+--    file3c:           C
+--
+-- The timestamps are for the different commit events in the files do not
+-- match, so that the cycle splitter cannot split by timestamp. As opposed
+-- to the cycle_splitter5 test, the timestamps of the *c,v files are set
+-- in between the type 2 and type 3 events, so that the cycle splitter
+-- cannot split this cycle because it refuses to split blobs with type 1
+-- events it doesn't know where to put.
+
+-- 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_splitter6/cvs-repository/test/file1,v	c65ccf8a3f4faf2cd9ed0e33325670fbb9cd6afe
+++ tests/importing_cvs_cycle_splitter6/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_splitter6/cvs-repository/test/file1b,v	dca8b9c704579e008cfac64751970f8edb317c7a
+++ tests/importing_cvs_cycle_splitter6/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_splitter6/cvs-repository/test/file1c,v	624014a7f21f1f5c95c95e2e7f8bf00a4179e36d
+++ tests/importing_cvs_cycle_splitter6/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_splitter6/cvs-repository/test/file2,v	e5141f1ffe30b872a2379304f2f08b8a8c027248
+++ tests/importing_cvs_cycle_splitter6/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_splitter6/cvs-repository/test/file2b,v	5905bdaa79d171faa34c61fe143634969fdcc09e
+++ tests/importing_cvs_cycle_splitter6/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_splitter6/cvs-repository/test/file2c,v	1fe7d3ffb90b8a003a096dcdad34800574f03697
+++ tests/importing_cvs_cycle_splitter6/cvs-repository/test/file2c,v	1fe7d3ffb90b8a003a096dcdad34800574f03697
@@ -0,0 +1,28 @@
+head	1.1;
+access;
+symbols;
+locks; strict;
+comment	@# @;
+
+
+1.1
+date	2008.01.01.12.25.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_splitter6/cvs-repository/test/file3,v	4c0e3f3bb313ec571a00cfbf5ed50c14024489d1
+++ tests/importing_cvs_cycle_splitter6/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_splitter6/cvs-repository/test/file3b,v	e8d1eb497d0265e0c7e966a2a6dfa2611c19737d
+++ tests/importing_cvs_cycle_splitter6/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_splitter6/cvs-repository/test/file3c,v	be67d185cec762161564e25e516bbc81c180a67d
+++ tests/importing_cvs_cycle_splitter6/cvs-repository/test/file3c,v	be67d185cec762161564e25e516bbc81c180a67d
@@ -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 C
+@
+text
address@hidden 1
+a1 1
+version 1.1 of test file2
+@
+
+
============================================================
--- tests/importing_cvs_cycle_splitter5/__driver__.lua	6b6845c43162b61283d7937b4cb3dcb9c6317ae2
+++ tests/importing_cvs_cycle_splitter5/__driver__.lua	b081f233e8076b698da31b33911eac6040276b20
@@ -1,14 +1,25 @@ check(get("cvs-repository"))
 
 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:
+-- have 2x three files and some pretty nasty cyclic dependencies:
 --
---    fileA:  A -> B -> C
+--    file1:  A -> B -> C
 --    file2:       B -> C -> A
 --    file3:            C -> A -> B
+--    file1b: A -> B -> C
+--    file2b:      B -> C -> A
+--    file3b:           C -> A -> B
+--
+-- The timestamps are for the different commit events in the files do not
+-- quite match, so that the cycle splitter cannot split by timestamp.
+-- However, in this case, there are only type 1 events we can clearly
+-- put to one or the other side (by its timestamps), so the cycle is
+-- splittable.
+--
+-- Check the cycle_splitter6 test, for additional cruelty.
 
 -- import into monotone and check presence of files
 check(mtn("--branch=test", "cvs_import", "--debug", "cvs-repository/test"), 0, false, false)