#
#
# add_dir "tests/importing_cvs_attic_duplicate"
# 
# add_dir "tests/importing_cvs_attic_duplicate/cvs-repository"
# 
# add_dir "tests/importing_cvs_attic_duplicate/cvs-repository/test"
# 
# add_dir "tests/importing_cvs_attic_duplicate/cvs-repository/test/Attic"
# 
# add_file "tests/importing_cvs_attic_duplicate/__driver__.lua"
#  content [27a3d6ff2eb7fb46f3c5bd28d891854513b28c66]
# 
# add_file "tests/importing_cvs_attic_duplicate/cvs-repository/test/Attic/foo,v"
#  content [61024236bbb5d166039d56d4cb8e76d7d72f96e5]
# 
# add_file "tests/importing_cvs_attic_duplicate/cvs-repository/test/foo,v"
#  content [0e6fdd74ff7670be95a2b9e1a0bed6aeff3944e2]
# 
# add_file "tests/importing_cvs_attic_duplicate/makerepo.sh"
#  content [8dae283939333365bc8b187e2b5cdf0257421040]
# 
#   set "tests/importing_cvs_attic_duplicate/makerepo.sh"
#  attr "mtn:execute"
# value "true"
#
============================================================
--- tests/importing_cvs_attic_duplicate/__driver__.lua	27a3d6ff2eb7fb46f3c5bd28d891854513b28c66
+++ tests/importing_cvs_attic_duplicate/__driver__.lua	27a3d6ff2eb7fb46f3c5bd28d891854513b28c66
@@ -0,0 +1,10 @@
+
+mtn_setup()
+
+-- See makerepo.sh on how this repository was created.
+check(get("cvs-repository"))
+
+-- try an import, it currently still fails, due to duplicate RCS files in
+-- attic and live directory.
+xfail(mtn("--branch=testbranch", "cvs_import", "cvs-repository/test"), 0, false, false)
+
============================================================
--- tests/importing_cvs_attic_duplicate/cvs-repository/test/Attic/foo,v	61024236bbb5d166039d56d4cb8e76d7d72f96e5
+++ tests/importing_cvs_attic_duplicate/cvs-repository/test/Attic/foo,v	61024236bbb5d166039d56d4cb8e76d7d72f96e5
@@ -0,0 +1,40 @@
+head	1.2;
+access;
+symbols;
+locks; strict;
+comment	@# @;
+
+
+1.2
+date	2007.10.18.15.59.55;	author markus;	state dead;
+branches;
+next	1.1;
+commitid	Bk2TQE6FQ3fkB5Cs;
+
+1.1
+date	2007.10.18.15.59.54;	author markus;	state Exp;
+branches;
+next	;
+commitid	nRks6SXxBpKjB5Cs;
+
+
+desc
+@@
+
+
+1.2
+log
address@hidden test/foo
+@
+text
address@hidden 0 of test file foo
+@
+
+
+1.1
+log
address@hidden 0
+@
+text
+@@
+
============================================================
--- tests/importing_cvs_attic_duplicate/cvs-repository/test/foo,v	0e6fdd74ff7670be95a2b9e1a0bed6aeff3944e2
+++ tests/importing_cvs_attic_duplicate/cvs-repository/test/foo,v	0e6fdd74ff7670be95a2b9e1a0bed6aeff3944e2
@@ -0,0 +1,25 @@
+head	1.1;
+access;
+symbols;
+locks; strict;
+comment	@# @;
+
+
+1.1
+date	2007.10.18.15.59.54;	author markus;	state Exp;
+branches;
+next	;
+commitid	nRks6SXxBpKjB5Cs;
+
+
+desc
+@@
+
+
+1.1
+log
address@hidden 0
+@
+text
address@hidden 0 of test file foo
+@
============================================================
--- tests/importing_cvs_attic_duplicate/makerepo.sh	8dae283939333365bc8b187e2b5cdf0257421040
+++ tests/importing_cvs_attic_duplicate/makerepo.sh	8dae283939333365bc8b187e2b5cdf0257421040
@@ -0,0 +1,39 @@
+#!/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 file foo" > test/foo
+cvs add test/foo
+cvs commit -m "commit 0" test/foo
+
+# make a backup of the current file foo
+cp $CVSROOT/test/foo,v $CVSROOT/test/foo,v.bak
+
+# delete file foo with CVS, so is gets moved to the attic
+rm test/foo
+cvs remove test/foo
+cvs commit -m "deleted test/foo" test/foo
+
+cd ..
+rm -rf full_checkout
+
+# restore the backup repository file
+mv $CVSROOT/test/foo,v.bak $CVSROOT/test/foo,v
+
+# clean up the CVS repository bookkeeping dir
+rm -rf cvs-repository/CVSROOT