# 
# add_file "tests/t_cvsimport2.at"
# 
# patch "ChangeLog"
#  from [9d688219110dac4c71fcfc8a0002b17b8b0dfa31]
#    to [47a4e870b6e23d9eda9e3269c9a53c4cfdaececb]
# 
# patch "tests/t_cvsimport2.at"
#  from []
#    to [4641874ff2fbedf55b84c1169dd86e4d2354c36b]
# 
# patch "testsuite.at"
#  from [7a984808e7c5343ed9bbc33629127ce58aa9281c]
#    to [af3df6b6c1f6e52c2d4a67ce5205287bda3c77fc]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,4 +1,8 @@
 2005-04-16  Sebastian Spaeth <address@hidden>
+	* add tests/t_cvsimport2.at: CVS Attic files fail test
+	reported by: address@hidden 15.04.2005 02:45
+
+2005-04-16  Sebastian Spaeth <address@hidden>
 	* add tests/t_rcs_import.at: problematic CVS import as reported 
 	in the list. However it works just fine here, so it really tests for 
 	a successful pass
--- tests/t_cvsimport2.at
+++ tests/t_cvsimport2.at
@@ -0,0 +1,41 @@
+AT_SETUP([test failing cvs import (Attic)])
+MONOTONE_SETUP
+
+# This test imports a cvs archive with files in the Attic which fails
+#monotone: fatal: std::logic_error: change_set.cc:2546: invariant 'I(b.rearrangement.deleted_files.empty())' violated
+
+# reported by: address@hidden 15.04.2005 02:45
+# This test is a bug report.
+AT_XFAIL_IF(true)
+
+AT_DATA(prepare.sh,[#!/bin/sh
+export CVSROOT=$PWD/cvsroot
+
+cvs init
+mkdir src
+echo FOO > src/foo
+(
+	cd src
+	cvs import -m import mod vtag rtag
+)
+rm -rf src
+
+mkdir src
+(
+	cd src
+	cvs co mod
+	cd mod
+	cvs tag -b branch
+	cvs up -r branch
+	echo BAR > bar
+	cvs add bar
+	cvs ci -m 'add bar'
+)
+])
+
+AT_CHECK(sh prepare.sh, [], ignore, ignore)
+
+AT_CHECK(MONOTONE --branch=test cvs_import ., [], ignore, ignore)
+
+AT_CLEANUP
+(END)
--- testsuite.at
+++ testsuite.at
@@ -553,3 +553,4 @@
 m4_include(tests/t_setup_checkout_modify_new_dir.at)
 m4_include(tests/t_rename_dir_add_dir_with_old_name.at)
 m4_include(tests/t_rcs_import.at)
+m4_include(tests/t_cvsimport2.at)