#
#
# add_dir "tests/importing_cvs_with_tags_after_delete/cvs-repository"
# 
# add_dir "tests/importing_cvs_with_tags_after_delete/cvs-repository/test"
# 
# add_dir "tests/importing_cvs_with_tags_after_delete/cvs-repository/test/Attic"
# 
# add_file "tests/importing_cvs_with_tags_after_delete/cvs-repository/test/Attic/bar,v"
#  content [c8854e6bb7a77e02faddbffd39a7ce66056bcfa1]
# 
# add_file "tests/importing_cvs_with_tags_after_delete/cvs-repository/test/foo,v"
#  content [0ed83b720e2816f239395180cb8a2ba3a08d6c29]
# 
# add_file "tests/importing_cvs_with_tags_after_delete/makerepo.sh"
#  content [0256d0c5e40417c8ca480dff47d39ef3c2b1c480]
# 
# patch "tests/importing_cvs_with_tags_after_delete/__driver__.lua"
#  from [a5e3b5ab1a7fb6daceeb04309a56aa35f2caf9e0]
#    to [9687910f04ccb8fa130c3495f550c5cbe080b1a7]
# 
#   set "tests/importing_cvs_with_tags_after_delete/makerepo.sh"
#  attr "mtn:execute"
# value "true"
#
============================================================
--- tests/importing_cvs_with_tags_after_delete/cvs-repository/test/Attic/bar,v	c8854e6bb7a77e02faddbffd39a7ce66056bcfa1
+++ tests/importing_cvs_with_tags_after_delete/cvs-repository/test/Attic/bar,v	c8854e6bb7a77e02faddbffd39a7ce66056bcfa1
@@ -0,0 +1,41 @@
+head	1.2;
+access;
+symbols
+	FOO_AND_BAR:1.1;
+locks; strict;
+comment	@# @;
+
+
+1.2
+date	2007.03.10.13.08.07;	author markus;	state dead;
+branches;
+next	1.1;
+commitid	vjIWBEV9GvfOMx9s;
+
+1.1
+date	2007.03.10.13.08.06;	author markus;	state Exp;
+branches;
+next	;
+commitid	AOUtoJE3Y9YNMx9s;
+
+
+desc
+@@
+
+
+1.2
+log
address@hidden bar
+@
+text
address@hidden
+@
+
+
+1.1
+log
address@hidden import
+@
+text
+@@
+
============================================================
--- tests/importing_cvs_with_tags_after_delete/cvs-repository/test/foo,v	0ed83b720e2816f239395180cb8a2ba3a08d6c29
+++ tests/importing_cvs_with_tags_after_delete/cvs-repository/test/foo,v	0ed83b720e2816f239395180cb8a2ba3a08d6c29
@@ -0,0 +1,27 @@
+head	1.1;
+access;
+symbols
+	FOO_ONLY:1.1
+	FOO_AND_BAR:1.1;
+locks; strict;
+comment	@# @;
+
+
+1.1
+date	2007.03.10.13.08.06;	author markus;	state Exp;
+branches;
+next	;
+commitid	AOUtoJE3Y9YNMx9s;
+
+
+desc
+@@
+
+
+1.1
+log
address@hidden import
+@
+text
address@hidden
+@
============================================================
--- tests/importing_cvs_with_tags_after_delete/makerepo.sh	0256d0c5e40417c8ca480dff47d39ef3c2b1c480
+++ tests/importing_cvs_with_tags_after_delete/makerepo.sh	0256d0c5e40417c8ca480dff47d39ef3c2b1c480
@@ -0,0 +1,40 @@
+#!/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
+
+# two files to begin with
+echo "foo" > foo
+echo "bar" > bar
+cvs add foo bar
+cvs commit -m "Initial import"
+
+# tag both files
+cvs tag FOO_AND_BAR
+
+# delete file bar and tag again
+cvs remove -f bar
+cvs commit -m "removed bar"
+
+# tag only foo
+cvs tag FOO_ONLY
+
+cd ../..
+rm -rf full_checkout
+
+# clean up the CVS repository bookkeeping dir
+rm -rf cvs-repository/CVSROOT
============================================================
--- tests/importing_cvs_with_tags_after_delete/__driver__.lua	a5e3b5ab1a7fb6daceeb04309a56aa35f2caf9e0
+++ tests/importing_cvs_with_tags_after_delete/__driver__.lua	9687910f04ccb8fa130c3495f550c5cbe080b1a7
@@ -1,8 +1,9 @@
 
-include("/common/cvs.lua")
 mtn_setup()
-cvs_setup()
 
+-- See makerepo.sh on how this repository was created.
+check(get("cvs-repository"))
+
 -- A test case inspired by Marko Macek from the address@hidden mailing list:
 -- http://cvs2svn.tigris.org/servlets/ReadMsg?list=dev&msgNo=1877
 --
@@ -10,25 +11,8 @@ cvs_setup()
 -- again. The monotone repository is then checked for correct files
 -- in the tagged revisions.
 
-check(cvs("co", "."), 0, false, false)
-mkdir("testdir")
-writefile("testdir/foo", "foo")
-writefile("testdir/bar", "bar")
-check(cvs("add", "testdir"), 0, false, false)
-check(cvs("add", "testdir/foo"), 0, false, false)
-check(cvs("add", "testdir/bar"), 0, false, false)
-check(cvs("commit", "-m", 'Initial import'), 0, false, false)
-
--- check out the repository created and tag it
-check(cvs("tag", "FOO_AND_BAR"), 0, false, false)
-
--- delete bar and tag again
-check(indir("testdir", cvs("remove", "-f", "bar")), 0, false, false)
-check(cvs("commit", "-m", "removed bar"), 0, false, false)
-check(cvs("tag", "FOO_ONLY"), 0, false, false)
-
 -- import and check
-check(mtn("--branch=test", "cvs_import", cvsroot.."/testdir"), 0, false, false)
+check(mtn("--branch=test", "cvs_import", "cvs-repository/test"), 0, false, false)
 
 check(mtn("checkout", "--revision=FOO_AND_BAR", "mtnco"), 0, false, false)
 check(indir("mtnco", mtn("list", "known")), 0, true, false)
@@ -38,4 +22,4 @@ check(samelines("stdout", {"foo"}))
 check(mtn("checkout", "--revision=FOO_ONLY", "mtnco"), 0, false, false)
 check(indir("mtnco", mtn("list", "known")), 0, true, false)
 check(samelines("stdout", {"foo"}))
+
-remove("mtnco")