#
#
# add_dir "tests/importing_cvs_branches5"
# 
# add_dir "tests/importing_cvs_branches5/cvs-repository"
# 
# add_dir "tests/importing_cvs_branches5/cvs-repository/test"
# 
# add_dir "tests/importing_cvs_with_conflicting_tag3"
# 
# add_dir "tests/importing_cvs_with_conflicting_tag3/cvs-repository"
# 
# add_dir "tests/importing_cvs_with_conflicting_tag3/cvs-repository/test"
# 
# add_file "tests/importing_cvs_branches5/__driver__.lua"
#  content [d3120c4265414de4d98290ba0f1edfda87526640]
# 
# add_file "tests/importing_cvs_branches5/cvs-repository/test/file1,v"
#  content [c2028d4d55a1b3aaa404ca82b2e9b001ee58d665]
# 
# add_file "tests/importing_cvs_branches5/cvs-repository/test/file2,v"
#  content [da7b097869c90c410cac2b4f59eeeaf141bf6a46]
# 
# add_file "tests/importing_cvs_branches5/makerepo.sh"
#  content [000ea72d582db70e0059670c61dc6c674c5d1265]
# 
# add_file "tests/importing_cvs_with_conflicting_tag3/__driver__.lua"
#  content [d3120c4265414de4d98290ba0f1edfda87526640]
# 
# add_file "tests/importing_cvs_with_conflicting_tag3/cvs-repository/test/file1,v"
#  content [426be0e925849dc091f58fb84cef18e6926e29fa]
# 
# add_file "tests/importing_cvs_with_conflicting_tag3/cvs-repository/test/file2,v"
#  content [d0b7a86e45aff2b3a684c14a04517058739b2fc7]
# 
# add_file "tests/importing_cvs_with_conflicting_tag3/makerepo.sh"
#  content [52fadc4b5d0126605026fb13a6bd9e3135cc3c64]
# 
#   set "tests/importing_cvs_branches5/makerepo.sh"
#  attr "mtn:execute"
# value "true"
# 
#   set "tests/importing_cvs_with_conflicting_tag3/makerepo.sh"
#  attr "mtn:execute"
# value "true"
#
============================================================
--- tests/importing_cvs_branches5/__driver__.lua	d3120c4265414de4d98290ba0f1edfda87526640
+++ tests/importing_cvs_branches5/__driver__.lua	d3120c4265414de4d98290ba0f1edfda87526640
@@ -0,0 +1,14 @@
+
+mtn_setup()
+
+
+-- See makerepo.sh on how this repository was created.
+check(get("cvs-repository"))
+
+-- based on cvs_branches4, but this time with a tag C on
+-- fileA @ 1.1.2.1 in branch A and fileB @ 1.1.4.1 in
+-- branch B.
+
+-- import into monotone and check presence of files
+xfail(mtn("--branch=test", "cvs_import", "cvs-repository/test"), 0, false, false)
+
============================================================
--- tests/importing_cvs_branches5/cvs-repository/test/file1,v	c2028d4d55a1b3aaa404ca82b2e9b001ee58d665
+++ tests/importing_cvs_branches5/cvs-repository/test/file1,v	c2028d4d55a1b3aaa404ca82b2e9b001ee58d665
@@ -0,0 +1,83 @@
+head	1.1;
+access;
+symbols
+	CONFLICTING_BRANCH:1.1.4.1.0.2
+	B:1.1.0.4
+	A:1.1.0.2;
+locks; strict;
+comment	@# @;
+
+
+1.1
+date	2007.11.07.21.35.55;	author markus;	state Exp;
+branches
+	1.1.2.1
+	1.1.4.1;
+next	;
+commitid	YFBa72YEkWqJOGEs;
+
+1.1.2.1
+date	2007.11.07.21.35.56;	author markus;	state Exp;
+branches;
+next	;
+commitid	NSnlnVIqfRXJOGEs;
+
+1.1.4.1
+date	2007.11.07.21.35.58;	author markus;	state Exp;
+branches
+	1.1.4.1.2.1;
+next	;
+commitid	Q3ZGezl52YIKOGEs;
+
+1.1.4.1.2.1
+date	2007.11.07.21.36.00;	author markus;	state Exp;
+branches;
+next	;
+commitid	dEkFcPJggVdLOGEs;
+
+
+desc
+@@
+
+
+1.1
+log
address@hidden import
+@
+text
address@hidden 1.1 of test file1
+@
+
+
+1.1.4.1
+log
address@hidden in branch B
+@
+text
address@hidden 1
+a1 1
+version 1.1.4.1 of test file1
+@
+
+
+1.1.4.1.2.1
+log
address@hidden in CONFLICTING_BRANCH
+@
+text
address@hidden 1
+a1 1
+version ? of test file1
+@
+
+
+1.1.2.1
+log
address@hidden in branch A
+@
+text
address@hidden 1
+a1 1
+version 1.1.2.1 of test file1
+@
+
============================================================
--- tests/importing_cvs_branches5/cvs-repository/test/file2,v	da7b097869c90c410cac2b4f59eeeaf141bf6a46
+++ tests/importing_cvs_branches5/cvs-repository/test/file2,v	da7b097869c90c410cac2b4f59eeeaf141bf6a46
@@ -0,0 +1,66 @@
+head	1.1;
+access;
+symbols
+	CONFLICTING_BRANCH:1.1.2.1.0.2
+	B:1.1.0.4
+	A:1.1.0.2;
+locks; strict;
+comment	@# @;
+
+
+1.1
+date	2007.11.07.21.35.55;	author markus;	state Exp;
+branches
+	1.1.2.1;
+next	;
+commitid	YFBa72YEkWqJOGEs;
+
+1.1.2.1
+date	2007.11.07.21.35.56;	author markus;	state Exp;
+branches
+	1.1.2.1.2.1;
+next	;
+commitid	NSnlnVIqfRXJOGEs;
+
+1.1.2.1.2.1
+date	2007.11.07.21.36.00;	author markus;	state Exp;
+branches;
+next	;
+commitid	dEkFcPJggVdLOGEs;
+
+
+desc
+@@
+
+
+1.1
+log
address@hidden import
+@
+text
address@hidden 1.1 of test file2
+@
+
+
+1.1.2.1
+log
address@hidden in branch A
+@
+text
address@hidden 1
+a1 1
+version 1.1.2.1 of test file2
+@
+
+
+1.1.2.1.2.1
+log
address@hidden in CONFLICTING_BRANCH
+@
+text
address@hidden 1
+a1 1
+version ? of test file2
+@
+
+
============================================================
--- tests/importing_cvs_branches5/makerepo.sh	000ea72d582db70e0059670c61dc6c674c5d1265
+++ tests/importing_cvs_branches5/makerepo.sh	000ea72d582db70e0059670c61dc6c674c5d1265
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+CVSROOT=`pwd`/cvs-repository
+export CVSROOT
+
+# deleting the existing cvs-repository
+rm -vrf $CVSROOT
+
+# initializing a new repository
+cvs init
+
+# do a full checkout of the repository
+mkdir full_checkout
+cd full_checkout
+cvs co .
+mkdir test
+cvs add test
+cd test
+
+# checkout the empty repository and commit some files
+echo "version 1.1 of test file1" > file1
+echo "version 1.1 of test file2" > file2
+cvs add file1 file2
+cvs commit -m "initial import" file1 file2
+
+# now we create a branch A
+cvs tag -b A
+cvs update -r A
+
+# a commit which will later conflict with one in branch B
+echo "version 1.1.2.1 of test file1" > file1
+echo "version 1.1.2.1 of test file2" > file2
+cvs commit -m "commit in branch A" file1 file2
+
+# go back to the trunk and branch into B
+cvs update -A
+cvs tag -b B
+cvs update -r B
+
+# a conflicting commit with (file2 of) branch A
+echo "version 1.1.4.1 of test file1" > file1
+cvs commit -m "commit in branch B" file1
+
+cvs update -r A file2
+cvs tag -b CONFLICTING_BRANCH
+cvs update -r CONFLICTING_BRANCH
+echo "version ? of test file1" > file1
+echo "version ? of test file2" > file2
+cvs commit -m "commit in CONFLICTING_BRANCH" file1 file2
+
+cd ../..
+rm -rf full_checkout
+
+# clean up the CVS repository bookkeeping dir
+rm -rf cvs-repository/CVSROOT
+
============================================================
--- tests/importing_cvs_with_conflicting_tag3/__driver__.lua	d3120c4265414de4d98290ba0f1edfda87526640
+++ tests/importing_cvs_with_conflicting_tag3/__driver__.lua	d3120c4265414de4d98290ba0f1edfda87526640
@@ -0,0 +1,14 @@
+
+mtn_setup()
+
+
+-- See makerepo.sh on how this repository was created.
+check(get("cvs-repository"))
+
+-- based on cvs_branches4, but this time with a tag C on
+-- fileA @ 1.1.2.1 in branch A and fileB @ 1.1.4.1 in
+-- branch B.
+
+-- import into monotone and check presence of files
+xfail(mtn("--branch=test", "cvs_import", "cvs-repository/test"), 0, false, false)
+
============================================================
--- tests/importing_cvs_with_conflicting_tag3/cvs-repository/test/file1,v	426be0e925849dc091f58fb84cef18e6926e29fa
+++ tests/importing_cvs_with_conflicting_tag3/cvs-repository/test/file1,v	426be0e925849dc091f58fb84cef18e6926e29fa
@@ -0,0 +1,84 @@
+head	1.1;
+access;
+symbols
+	CONFLICTING_BRANCH:1.1.4.1.0.2
+	CONFLICTING_TAG:1.1.4.1
+	B:1.1.0.4
+	A:1.1.0.2;
+locks; strict;
+comment	@# @;
+
+
+1.1
+date	2007.11.07.21.42.36;	author markus;	state Exp;
+branches
+	1.1.2.1
+	1.1.4.1;
+next	;
+commitid	mQwb4CqC9hx1RGEs;
+
+1.1.2.1
+date	2007.11.07.21.42.37;	author markus;	state Exp;
+branches;
+next	;
+commitid	YbbWgk9uqLZ1RGEs;
+
+1.1.4.1
+date	2007.11.07.21.42.39;	author markus;	state Exp;
+branches
+	1.1.4.1.2.1;
+next	;
+commitid	6YpI8MntERQ2RGEs;
+
+1.1.4.1.2.1
+date	2007.11.07.21.42.41;	author markus;	state Exp;
+branches;
+next	;
+commitid	VM7Acs5lYBj3RGEs;
+
+
+desc
+@@
+
+
+1.1
+log
address@hidden import
+@
+text
address@hidden 1.1 of test file1
+@
+
+
+1.1.4.1
+log
address@hidden in branch B
+@
+text
address@hidden 1
+a1 1
+version 1.1.4.1 of test file1
+@
+
+
+1.1.4.1.2.1
+log
address@hidden in CONFLICTING_BRANCH
+@
+text
address@hidden 1
+a1 1
+version ? of test file1
+@
+
+
+1.1.2.1
+log
address@hidden in branch A
+@
+text
address@hidden 1
+a1 1
+version 1.1.2.1 of test file1
+@
+
============================================================
--- tests/importing_cvs_with_conflicting_tag3/cvs-repository/test/file2,v	d0b7a86e45aff2b3a684c14a04517058739b2fc7
+++ tests/importing_cvs_with_conflicting_tag3/cvs-repository/test/file2,v	d0b7a86e45aff2b3a684c14a04517058739b2fc7
@@ -0,0 +1,67 @@
+head	1.1;
+access;
+symbols
+	CONFLICTING_BRANCH:1.1.2.1.0.2
+	B:1.1.0.4
+	CONFLICTING_TAG:1.1.2.1
+	A:1.1.0.2;
+locks; strict;
+comment	@# @;
+
+
+1.1
+date	2007.11.07.21.42.36;	author markus;	state Exp;
+branches
+	1.1.2.1;
+next	;
+commitid	mQwb4CqC9hx1RGEs;
+
+1.1.2.1
+date	2007.11.07.21.42.37;	author markus;	state Exp;
+branches
+	1.1.2.1.2.1;
+next	;
+commitid	YbbWgk9uqLZ1RGEs;
+
+1.1.2.1.2.1
+date	2007.11.07.21.42.41;	author markus;	state Exp;
+branches;
+next	;
+commitid	VM7Acs5lYBj3RGEs;
+
+
+desc
+@@
+
+
+1.1
+log
address@hidden import
+@
+text
address@hidden 1.1 of test file2
+@
+
+
+1.1.2.1
+log
address@hidden in branch A
+@
+text
address@hidden 1
+a1 1
+version 1.1.2.1 of test file2
+@
+
+
+1.1.2.1.2.1
+log
address@hidden in CONFLICTING_BRANCH
+@
+text
address@hidden 1
+a1 1
+version ? of test file2
+@
+
+
============================================================
--- tests/importing_cvs_with_conflicting_tag3/makerepo.sh	52fadc4b5d0126605026fb13a6bd9e3135cc3c64
+++ tests/importing_cvs_with_conflicting_tag3/makerepo.sh	52fadc4b5d0126605026fb13a6bd9e3135cc3c64
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+CVSROOT=`pwd`/cvs-repository
+export CVSROOT
+
+# deleting the existing cvs-repository
+rm -vrf $CVSROOT
+
+# initializing a new repository
+cvs init
+
+# do a full checkout of the repository
+mkdir full_checkout
+cd full_checkout
+cvs co .
+mkdir test
+cvs add test
+cd test
+
+# checkout the empty repository and commit some files
+echo "version 1.1 of test file1" > file1
+echo "version 1.1 of test file2" > file2
+cvs add file1 file2
+cvs commit -m "initial import" file1 file2
+
+# now we create a branch A
+cvs tag -b A
+cvs update -r A
+
+# a commit which will later conflict with one in branch B
+echo "version 1.1.2.1 of test file1" > file1
+echo "version 1.1.2.1 of test file2" > file2
+cvs commit -m "commit in branch A" file1 file2
+cvs tag CONFLICTING_TAG file2
+
+# go back to the trunk and branch into B
+cvs update -A
+cvs tag -b B
+cvs update -r B
+
+# a conflicting commit with (file2 of) branch A
+echo "version 1.1.4.1 of test file1" > file1
+cvs commit -m "commit in branch B" file1
+cvs tag CONFLICTING_TAG file1
+
+cvs update -r A file2
+cvs tag -b CONFLICTING_BRANCH
+cvs update -r CONFLICTING_BRANCH
+echo "version ? of test file1" > file1
+echo "version ? of test file2" > file2
+cvs commit -m "commit in CONFLICTING_BRANCH" file1 file2
+
+cd ../..
+rm -rf full_checkout
+
+# clean up the CVS repository bookkeeping dir
+rm -rf cvs-repository/CVSROOT
+