#
#
# add_dir "tests/importing_cvs_files_with_identical_log3"
# 
# add_dir "tests/importing_cvs_files_with_identical_log3/cvs-repository"
# 
# add_dir "tests/importing_cvs_files_with_identical_log3/cvs-repository/test"
# 
# add_file "tests/importing_cvs_files_with_identical_log3/__driver__.lua"
#  content [84ba24f106105034d0c0ce2902b14a23b240fd53]
# 
# add_file "tests/importing_cvs_files_with_identical_log3/cvs-repository/test/foo,v"
#  content [c73c3bcaababad00f102996fa78c6d4dd4fce1f8]
# 
# add_file "tests/importing_cvs_files_with_identical_log3/makerepo.sh"
#  content [4013b4be2cf2944f5a35772e523d6a3394cbe907]
# 
#   set "tests/importing_cvs_files_with_identical_log3/makerepo.sh"
#  attr "mtn:execute"
# value "true"
#
============================================================
--- tests/importing_cvs_files_with_identical_log3/__driver__.lua	84ba24f106105034d0c0ce2902b14a23b240fd53
+++ tests/importing_cvs_files_with_identical_log3/__driver__.lua	84ba24f106105034d0c0ce2902b14a23b240fd53
@@ -0,0 +1,9 @@
+
+mtn_setup()
+
+-- See makerepo.sh on how this repository was created.
+check(get("cvs-repository"))
+
+-- import into monotone
+check(mtn("--branch=testbranch", "cvs_import", "cvs-repository/test"), 0, false, false)
+
============================================================
--- tests/importing_cvs_files_with_identical_log3/cvs-repository/test/foo,v	c73c3bcaababad00f102996fa78c6d4dd4fce1f8
+++ tests/importing_cvs_files_with_identical_log3/cvs-repository/test/foo,v	c73c3bcaababad00f102996fa78c6d4dd4fce1f8
@@ -0,0 +1,64 @@
+head	1.1;
+access;
+symbols
+	branchB:1.1.0.4
+	branchA:1.1.0.2;
+locks; strict;
+comment	@# @;
+
+
+1.1
+date	2007.07.23.20.23.55;	author markus;	state Exp;
+branches
+	1.1.2.1
+	1.1.4.1;
+next	;
+commitid	WGmWJAfI7f3hRVqs;
+
+1.1.2.1
+date	2007.07.23.20.23.56;	author markus;	state Exp;
+branches;
+next	;
+commitid	Ub6f89VNTXghRVqs;
+
+1.1.4.1
+date	2007.07.23.20.23.58;	author markus;	state Exp;
+branches;
+next	;
+commitid	8aWBUV8V2r5iRVqs;
+
+
+desc
+@@
+
+
+1.1
+log
address@hidden import
+@
+text
address@hidden 1.1 of test file foo
+@
+
+
+1.1.4.1
+log
address@hidden irritating commit message
+@
+text
address@hidden 1
+a1 1
+version 1.1.4.1 of test file foo
+@
+
+
+1.1.2.1
+log
address@hidden irritating commit message
+@
+text
address@hidden 1
+a1 1
+version 1.1.2.1 of test file foo
+@
+
============================================================
--- tests/importing_cvs_files_with_identical_log3/makerepo.sh	4013b4be2cf2944f5a35772e523d6a3394cbe907
+++ tests/importing_cvs_files_with_identical_log3/makerepo.sh	4013b4be2cf2944f5a35772e523d6a3394cbe907
@@ -0,0 +1,44 @@
+#!/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
+
+# do some commits on file foo
+echo "version 1.1 of test file foo" > test/foo
+cvs add test/foo
+cvs commit -m "initial import" test/foo
+
+# create branchA
+cvs tag -b branchA
+cvs update -r branchA
+
+echo "version 1.1.2.1 of test file foo" > test/foo
+cvs commit -m "an irritating commit message" test/foo
+
+# back on mainline, create a branchB
+cvs update -A
+cvs tag -b branchB
+cvs update -r branchB
+
+echo "version 1.1.4.1 of test file foo" > test/foo
+cvs commit -m "an irritating commit message"
+
+cd ..
+rm -rf full_checkout
+
+# clean up the CVS repository bookkeeping dir
+rm -rf cvs-repository/CVSROOT
+