#
#
# add_dir "tests/importing_cvs_with_conflicting_tag2"
# 
# add_dir "tests/importing_cvs_with_conflicting_tag2/cvs-repository"
# 
# add_dir "tests/importing_cvs_with_conflicting_tag2/cvs-repository/test"
# 
# add_file "tests/importing_cvs_with_conflicting_tag2/__driver__.lua"
#  content [7422b2e07e9440a6305b7616d6594e3861170c49]
# 
# add_file "tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileA,v"
#  content [f8aa85b2190b6e5739ffee04d5a96e618707317e]
# 
# add_file "tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileB,v"
#  content [b37b0b0f50cad13131d2bc79e11dbafc208908b8]
# 
# add_file "tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileC,v"
#  content [552f0988a0bf7da566efa387545a5fcb1478e062]
# 
# add_file "tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileD,v"
#  content [e3ea24ca675b4eaf9a3494efb3b18146008bfd33]
# 
# add_file "tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileE,v"
#  content [ecf7d39cc7b36d308cbfaaedfb4339d2085a67ca]
# 
# add_file "tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileF,v"
#  content [d8c30229d5bb00fb5e0ef546c03b5acac58a61c9]
# 
# add_file "tests/importing_cvs_with_conflicting_tag2/makerepo.sh"
#  content [02dea945212756b45ab04fd85e7b769095cbf8fa]
# 
#   set "tests/importing_cvs_with_conflicting_tag2/makerepo.sh"
#  attr "mtn:execute"
# value "true"
#
============================================================
--- tests/importing_cvs_with_conflicting_tag2/__driver__.lua	7422b2e07e9440a6305b7616d6594e3861170c49
+++ tests/importing_cvs_with_conflicting_tag2/__driver__.lua	7422b2e07e9440a6305b7616d6594e3861170c49
@@ -0,0 +1,21 @@
+mtn_setup()
+
+-- see makerepo.sh
+check(get("cvs-repository"))
+
+xfail(mtn("--branch=testbranch", "cvs_import", "cvs-repository"), 0, false, false)
+check(mtn("co", "-r", "t:NASTY_TAG", "."))
+
+check(mtn("list", "known"), 0, true)
+check(samelines("stdout", {"fileA", "fileB", "fileC", "fileD", "fileE", "fileF"}))
+
+check(mtn("list", "tags"), 0, true)
+
+-- check contents at tag NASTY_TAG
+check(samelines("test/fileA", {"version 0 of test fileA."}))
+check(samelines("test/fileB", {"version 1 of test fileB."}))
+check(samelines("test/fileC", {"version 2 of test fileC."}))
+check(samelines("test/fileD", {"version 3 of test fileD."}))
+check(samelines("test/fileE", {"version 4 of test fileE."}))
+check(samelines("test/fileF", {"version 5 of test fileF."}))
+
============================================================
--- tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileA,v	f8aa85b2190b6e5739ffee04d5a96e618707317e
+++ tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileA,v	f8aa85b2190b6e5739ffee04d5a96e618707317e
@@ -0,0 +1,112 @@
+head	1.6;
+access;
+symbols
+	NASTY_TAG:1.1;
+locks; strict;
+comment	@# @;
+
+
+1.6
+date	2007.10.26.19.25.06;	author markus;	state Exp;
+branches;
+next	1.5;
+commitid	GWOgQKQgUuZLt8Ds;
+
+1.5
+date	2007.10.26.19.25.05;	author markus;	state Exp;
+branches;
+next	1.4;
+commitid	ppKMAvxhBulLt8Ds;
+
+1.4
+date	2007.10.26.19.25.04;	author markus;	state Exp;
+branches;
+next	1.3;
+commitid	oxsaxlicDceLt8Ds;
+
+1.3
+date	2007.10.26.19.25.03;	author markus;	state Exp;
+branches;
+next	1.2;
+commitid	nnbtPnrQAfPKt8Ds;
+
+1.2
+date	2007.10.26.19.25.02;	author markus;	state Exp;
+branches;
+next	1.1;
+commitid	kAEgeBQ3YvAKt8Ds;
+
+1.1
+date	2007.10.26.19.25.01;	author markus;	state Exp;
+branches;
+next	;
+commitid	zoJ3IuYW7CVJt8Ds;
+
+
+desc
+@@
+
+
+1.6
+log
address@hidden 5
+@
+text
address@hidden 5 of test fileA
+@
+
+
+1.5
+log
address@hidden 4
+@
+text
address@hidden 1
+a1 1
+version 4 of test fileA
+@
+
+
+1.4
+log
address@hidden 3
+@
+text
address@hidden 1
+a1 1
+version 3 of test fileA
+@
+
+
+1.3
+log
address@hidden 2
+@
+text
address@hidden 1
+a1 1
+version 2 of test fileA
+@
+
+
+1.2
+log
address@hidden 1
+@
+text
address@hidden 1
+a1 1
+version 1 of test fileA
+@
+
+
+1.1
+log
address@hidden 0
+@
+text
address@hidden 1
+a1 1
+version 0 of test fileA
+@
+
============================================================
--- tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileB,v	b37b0b0f50cad13131d2bc79e11dbafc208908b8
+++ tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileB,v	b37b0b0f50cad13131d2bc79e11dbafc208908b8
@@ -0,0 +1,112 @@
+head	1.6;
+access;
+symbols
+	NASTY_TAG:1.2;
+locks; strict;
+comment	@# @;
+
+
+1.6
+date	2007.10.26.19.25.06;	author markus;	state Exp;
+branches;
+next	1.5;
+commitid	GWOgQKQgUuZLt8Ds;
+
+1.5
+date	2007.10.26.19.25.05;	author markus;	state Exp;
+branches;
+next	1.4;
+commitid	ppKMAvxhBulLt8Ds;
+
+1.4
+date	2007.10.26.19.25.04;	author markus;	state Exp;
+branches;
+next	1.3;
+commitid	oxsaxlicDceLt8Ds;
+
+1.3
+date	2007.10.26.19.25.03;	author markus;	state Exp;
+branches;
+next	1.2;
+commitid	nnbtPnrQAfPKt8Ds;
+
+1.2
+date	2007.10.26.19.25.02;	author markus;	state Exp;
+branches;
+next	1.1;
+commitid	kAEgeBQ3YvAKt8Ds;
+
+1.1
+date	2007.10.26.19.25.01;	author markus;	state Exp;
+branches;
+next	;
+commitid	zoJ3IuYW7CVJt8Ds;
+
+
+desc
+@@
+
+
+1.6
+log
address@hidden 5
+@
+text
address@hidden 5 of test fileB
+@
+
+
+1.5
+log
address@hidden 4
+@
+text
address@hidden 1
+a1 1
+version 4 of test fileB
+@
+
+
+1.4
+log
address@hidden 3
+@
+text
address@hidden 1
+a1 1
+version 3 of test fileB
+@
+
+
+1.3
+log
address@hidden 2
+@
+text
address@hidden 1
+a1 1
+version 2 of test fileB
+@
+
+
+1.2
+log
address@hidden 1
+@
+text
address@hidden 1
+a1 1
+version 1 of test fileB
+@
+
+
+1.1
+log
address@hidden 0
+@
+text
address@hidden 1
+a1 1
+version 0 of test fileB
+@
+
============================================================
--- tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileC,v	552f0988a0bf7da566efa387545a5fcb1478e062
+++ tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileC,v	552f0988a0bf7da566efa387545a5fcb1478e062
@@ -0,0 +1,112 @@
+head	1.6;
+access;
+symbols
+	NASTY_TAG:1.3;
+locks; strict;
+comment	@# @;
+
+
+1.6
+date	2007.10.26.19.25.06;	author markus;	state Exp;
+branches;
+next	1.5;
+commitid	GWOgQKQgUuZLt8Ds;
+
+1.5
+date	2007.10.26.19.25.05;	author markus;	state Exp;
+branches;
+next	1.4;
+commitid	ppKMAvxhBulLt8Ds;
+
+1.4
+date	2007.10.26.19.25.04;	author markus;	state Exp;
+branches;
+next	1.3;
+commitid	oxsaxlicDceLt8Ds;
+
+1.3
+date	2007.10.26.19.25.03;	author markus;	state Exp;
+branches;
+next	1.2;
+commitid	nnbtPnrQAfPKt8Ds;
+
+1.2
+date	2007.10.26.19.25.02;	author markus;	state Exp;
+branches;
+next	1.1;
+commitid	kAEgeBQ3YvAKt8Ds;
+
+1.1
+date	2007.10.26.19.25.01;	author markus;	state Exp;
+branches;
+next	;
+commitid	zoJ3IuYW7CVJt8Ds;
+
+
+desc
+@@
+
+
+1.6
+log
address@hidden 5
+@
+text
address@hidden 5 of test fileC
+@
+
+
+1.5
+log
address@hidden 4
+@
+text
address@hidden 1
+a1 1
+version 4 of test fileC
+@
+
+
+1.4
+log
address@hidden 3
+@
+text
address@hidden 1
+a1 1
+version 3 of test fileC
+@
+
+
+1.3
+log
address@hidden 2
+@
+text
address@hidden 1
+a1 1
+version 2 of test fileC
+@
+
+
+1.2
+log
address@hidden 1
+@
+text
address@hidden 1
+a1 1
+version 1 of test fileC
+@
+
+
+1.1
+log
address@hidden 0
+@
+text
address@hidden 1
+a1 1
+version 0 of test fileC
+@
+
============================================================
--- tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileD,v	e3ea24ca675b4eaf9a3494efb3b18146008bfd33
+++ tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileD,v	e3ea24ca675b4eaf9a3494efb3b18146008bfd33
@@ -0,0 +1,112 @@
+head	1.6;
+access;
+symbols
+	NASTY_TAG:1.4;
+locks; strict;
+comment	@# @;
+
+
+1.6
+date	2007.10.26.19.25.06;	author markus;	state Exp;
+branches;
+next	1.5;
+commitid	GWOgQKQgUuZLt8Ds;
+
+1.5
+date	2007.10.26.19.25.05;	author markus;	state Exp;
+branches;
+next	1.4;
+commitid	ppKMAvxhBulLt8Ds;
+
+1.4
+date	2007.10.26.19.25.04;	author markus;	state Exp;
+branches;
+next	1.3;
+commitid	oxsaxlicDceLt8Ds;
+
+1.3
+date	2007.10.26.19.25.03;	author markus;	state Exp;
+branches;
+next	1.2;
+commitid	nnbtPnrQAfPKt8Ds;
+
+1.2
+date	2007.10.26.19.25.02;	author markus;	state Exp;
+branches;
+next	1.1;
+commitid	kAEgeBQ3YvAKt8Ds;
+
+1.1
+date	2007.10.26.19.25.01;	author markus;	state Exp;
+branches;
+next	;
+commitid	zoJ3IuYW7CVJt8Ds;
+
+
+desc
+@@
+
+
+1.6
+log
address@hidden 5
+@
+text
address@hidden 5 of test fileD
+@
+
+
+1.5
+log
address@hidden 4
+@
+text
address@hidden 1
+a1 1
+version 4 of test fileD
+@
+
+
+1.4
+log
address@hidden 3
+@
+text
address@hidden 1
+a1 1
+version 3 of test fileD
+@
+
+
+1.3
+log
address@hidden 2
+@
+text
address@hidden 1
+a1 1
+version 2 of test fileD
+@
+
+
+1.2
+log
address@hidden 1
+@
+text
address@hidden 1
+a1 1
+version 1 of test fileD
+@
+
+
+1.1
+log
address@hidden 0
+@
+text
address@hidden 1
+a1 1
+version 0 of test fileD
+@
+
============================================================
--- tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileE,v	ecf7d39cc7b36d308cbfaaedfb4339d2085a67ca
+++ tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileE,v	ecf7d39cc7b36d308cbfaaedfb4339d2085a67ca
@@ -0,0 +1,112 @@
+head	1.6;
+access;
+symbols
+	NASTY_TAG:1.5;
+locks; strict;
+comment	@# @;
+
+
+1.6
+date	2007.10.26.19.25.06;	author markus;	state Exp;
+branches;
+next	1.5;
+commitid	GWOgQKQgUuZLt8Ds;
+
+1.5
+date	2007.10.26.19.25.05;	author markus;	state Exp;
+branches;
+next	1.4;
+commitid	ppKMAvxhBulLt8Ds;
+
+1.4
+date	2007.10.26.19.25.04;	author markus;	state Exp;
+branches;
+next	1.3;
+commitid	oxsaxlicDceLt8Ds;
+
+1.3
+date	2007.10.26.19.25.03;	author markus;	state Exp;
+branches;
+next	1.2;
+commitid	nnbtPnrQAfPKt8Ds;
+
+1.2
+date	2007.10.26.19.25.02;	author markus;	state Exp;
+branches;
+next	1.1;
+commitid	kAEgeBQ3YvAKt8Ds;
+
+1.1
+date	2007.10.26.19.25.01;	author markus;	state Exp;
+branches;
+next	;
+commitid	zoJ3IuYW7CVJt8Ds;
+
+
+desc
+@@
+
+
+1.6
+log
address@hidden 5
+@
+text
address@hidden 5 of test fileE
+@
+
+
+1.5
+log
address@hidden 4
+@
+text
address@hidden 1
+a1 1
+version 4 of test fileE
+@
+
+
+1.4
+log
address@hidden 3
+@
+text
address@hidden 1
+a1 1
+version 3 of test fileE
+@
+
+
+1.3
+log
address@hidden 2
+@
+text
address@hidden 1
+a1 1
+version 2 of test fileE
+@
+
+
+1.2
+log
address@hidden 1
+@
+text
address@hidden 1
+a1 1
+version 1 of test fileE
+@
+
+
+1.1
+log
address@hidden 0
+@
+text
address@hidden 1
+a1 1
+version 0 of test fileE
+@
+
============================================================
--- tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileF,v	d8c30229d5bb00fb5e0ef546c03b5acac58a61c9
+++ tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileF,v	d8c30229d5bb00fb5e0ef546c03b5acac58a61c9
@@ -0,0 +1,112 @@
+head	1.6;
+access;
+symbols
+	NASTY_TAG:1.6;
+locks; strict;
+comment	@# @;
+
+
+1.6
+date	2007.10.26.19.25.06;	author markus;	state Exp;
+branches;
+next	1.5;
+commitid	GWOgQKQgUuZLt8Ds;
+
+1.5
+date	2007.10.26.19.25.05;	author markus;	state Exp;
+branches;
+next	1.4;
+commitid	ppKMAvxhBulLt8Ds;
+
+1.4
+date	2007.10.26.19.25.04;	author markus;	state Exp;
+branches;
+next	1.3;
+commitid	oxsaxlicDceLt8Ds;
+
+1.3
+date	2007.10.26.19.25.03;	author markus;	state Exp;
+branches;
+next	1.2;
+commitid	nnbtPnrQAfPKt8Ds;
+
+1.2
+date	2007.10.26.19.25.02;	author markus;	state Exp;
+branches;
+next	1.1;
+commitid	kAEgeBQ3YvAKt8Ds;
+
+1.1
+date	2007.10.26.19.25.01;	author markus;	state Exp;
+branches;
+next	;
+commitid	zoJ3IuYW7CVJt8Ds;
+
+
+desc
+@@
+
+
+1.6
+log
address@hidden 5
+@
+text
address@hidden 5 of test fileF
+@
+
+
+1.5
+log
address@hidden 4
+@
+text
address@hidden 1
+a1 1
+version 4 of test fileF
+@
+
+
+1.4
+log
address@hidden 3
+@
+text
address@hidden 1
+a1 1
+version 3 of test fileF
+@
+
+
+1.3
+log
address@hidden 2
+@
+text
address@hidden 1
+a1 1
+version 2 of test fileF
+@
+
+
+1.2
+log
address@hidden 1
+@
+text
address@hidden 1
+a1 1
+version 1 of test fileF
+@
+
+
+1.1
+log
address@hidden 0
+@
+text
address@hidden 1
+a1 1
+version 0 of test fileF
+@
+
============================================================
--- tests/importing_cvs_with_conflicting_tag2/makerepo.sh	02dea945212756b45ab04fd85e7b769095cbf8fa
+++ tests/importing_cvs_with_conflicting_tag2/makerepo.sh	02dea945212756b45ab04fd85e7b769095cbf8fa
@@ -0,0 +1,96 @@
+#!/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 0 of test fileA" > test/fileA
+echo "version 0 of test fileB" > test/fileB
+echo "version 0 of test fileC" > test/fileC
+echo "version 0 of test fileD" > test/fileD
+echo "version 0 of test fileE" > test/fileE
+echo "version 0 of test fileF" > test/fileF
+cvs add test/file?
+cvs commit -m "commit 0" test/file?
+
+# tag fileA here
+cvs rtag NASTY_TAG test/fileA
+
+# continue committing
+echo "version 1 of test fileA" > test/fileA
+echo "version 1 of test fileB" > test/fileB
+echo "version 1 of test fileC" > test/fileC
+echo "version 1 of test fileD" > test/fileD
+echo "version 1 of test fileE" > test/fileE
+echo "version 1 of test fileF" > test/fileF
+cvs commit -m "commit 1" test/file?
+
+# tag fileB here
+cvs rtag NASTY_TAG test/fileB
+
+# continue committing
+echo "version 2 of test fileA" > test/fileA
+echo "version 2 of test fileB" > test/fileB
+echo "version 2 of test fileC" > test/fileC
+echo "version 2 of test fileD" > test/fileD
+echo "version 2 of test fileE" > test/fileE
+echo "version 2 of test fileF" > test/fileF
+cvs commit -m "commit 2" test/file?
+
+# tag fileC here
+cvs rtag NASTY_TAG test/fileC
+
+# continue committing
+echo "version 3 of test fileA" > test/fileA
+echo "version 3 of test fileB" > test/fileB
+echo "version 3 of test fileC" > test/fileC
+echo "version 3 of test fileD" > test/fileD
+echo "version 3 of test fileE" > test/fileE
+echo "version 3 of test fileF" > test/fileF
+cvs commit -m "commit 3" test/file?
+
+# tag fileD here
+cvs rtag NASTY_TAG test/fileD
+
+# continue committing
+echo "version 4 of test fileA" > test/fileA
+echo "version 4 of test fileB" > test/fileB
+echo "version 4 of test fileC" > test/fileC
+echo "version 4 of test fileD" > test/fileD
+echo "version 4 of test fileE" > test/fileE
+echo "version 4 of test fileF" > test/fileF
+cvs commit -m "commit 4" test/file?
+
+# tag fileE here
+cvs rtag NASTY_TAG test/fileE
+
+# continue committing
+echo "version 5 of test fileA" > test/fileA
+echo "version 5 of test fileB" > test/fileB
+echo "version 5 of test fileC" > test/fileC
+echo "version 5 of test fileD" > test/fileD
+echo "version 5 of test fileE" > test/fileE
+echo "version 5 of test fileF" > test/fileF
+cvs commit -m "commit 5" test/file?
+
+# tag fileF here
+cvs rtag NASTY_TAG test/fileF
+
+cd ..
+rm -rf full_checkout
+
+# clean up the CVS repository bookkeeping dir
+rm -rf cvs-repository/CVSROOT