#
#
# add_dir "tests/importing_cvs_with_tags_after_delete2"
# 
# add_dir "tests/importing_cvs_with_tags_after_delete2/cvs-repository"
# 
# add_dir "tests/importing_cvs_with_tags_after_delete2/cvs-repository/test"
# 
# add_dir "tests/importing_cvs_with_tags_after_delete2/cvs-repository/test/Attic"
# 
# add_file "tests/importing_cvs_with_tags_after_delete2/__driver__.lua"
#  content [9b4af00f2a95f2aa7ff508b30b5f0a4513954b75]
# 
# add_file "tests/importing_cvs_with_tags_after_delete2/cvs-repository/test/Attic/bar,v"
#  content [ff004967e8f41ee23b718a87b5ee2c77880f9d04]
# 
# add_file "tests/importing_cvs_with_tags_after_delete2/cvs-repository/test/foo,v"
#  content [0ed83b720e2816f239395180cb8a2ba3a08d6c29]
# 
# patch "tests/importing_cvs_with_tags_after_delete/cvs-repository/test/Attic/bar,v"
#  from [c8854e6bb7a77e02faddbffd39a7ce66056bcfa1]
#    to [fdf0d3a9a983d850a6cbcffc15106f543cc12e36]
# 
# patch "tests/importing_cvs_with_tags_after_delete/makerepo.sh"
#  from [0256d0c5e40417c8ca480dff47d39ef3c2b1c480]
#    to [32fabbb7638d004cedd2dd6d702dfb755332d504]
#
============================================================
--- tests/importing_cvs_with_tags_after_delete2/__driver__.lua	9b4af00f2a95f2aa7ff508b30b5f0a4513954b75
+++ tests/importing_cvs_with_tags_after_delete2/__driver__.lua	9b4af00f2a95f2aa7ff508b30b5f0a4513954b75
@@ -0,0 +1,25 @@
+
+mtn_setup()
+
+-- This test is based on importing_cvs_with_tags_after_delete, but
+-- has an additional timestamp issue. Due to timestamp adjustment, the
+-- file bar is suddenly alive in the tagged revision.
+--
+-- To avoid that error, we would have to make sure to not include a
+-- file in a tag which does not have the tag in it's RCS file. I.e.
+-- bar,v does not carry the FOO_ONLY tag.
+
+check(get("cvs-repository"))
+
+-- import and check
+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)
+check(samelines("stdout", {"bar", "foo"}))
+remove("mtnco")
+
+check(mtn("checkout", "--revision=FOO_ONLY", "mtnco"), 0, false, false)
+check(indir("mtnco", mtn("list", "known")), 0, true, false)
+xfail(samelines("stdout", {"foo"}))
+
============================================================
--- tests/importing_cvs_with_tags_after_delete2/cvs-repository/test/Attic/bar,v	ff004967e8f41ee23b718a87b5ee2c77880f9d04
+++ tests/importing_cvs_with_tags_after_delete2/cvs-repository/test/Attic/bar,v	ff004967e8f41ee23b718a87b5ee2c77880f9d04
@@ -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.06;	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_delete2/cvs-repository/test/foo,v	0ed83b720e2816f239395180cb8a2ba3a08d6c29
+++ tests/importing_cvs_with_tags_after_delete2/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/cvs-repository/test/Attic/bar,v	c8854e6bb7a77e02faddbffd39a7ce66056bcfa1
+++ tests/importing_cvs_with_tags_after_delete/cvs-repository/test/Attic/bar,v	fdf0d3a9a983d850a6cbcffc15106f543cc12e36
@@ -7,7 +7,7 @@ 1.2
 
 
 1.2
-date	2007.03.10.13.08.07;	author markus;	state dead;
+date	2007.03.10.13.08.12;	author markus;	state dead;
 branches;
 next	1.1;
 commitid	vjIWBEV9GvfOMx9s;
============================================================
--- tests/importing_cvs_with_tags_after_delete/makerepo.sh	0256d0c5e40417c8ca480dff47d39ef3c2b1c480
+++ tests/importing_cvs_with_tags_after_delete/makerepo.sh	32fabbb7638d004cedd2dd6d702dfb755332d504
@@ -26,6 +26,9 @@ cvs tag FOO_AND_BAR
 # tag both files
 cvs tag FOO_AND_BAR
 
+# make sure the timestamps different enough
+sleep 5
+
 # delete file bar and tag again
 cvs remove -f bar
 cvs commit -m "removed bar"