# 
# add_file "tests/t_cvsimport_manifest_cycle.at"
# 
# patch "AUTHORS"
#  from [c96aafdf0ebc641c6545c0cf384c66fb4d511ac8]
#    to [a0a0abb512ea69f29e20401e02113a750fcf466c]
# 
# patch "ChangeLog"
#  from [ea3bd119d35634eedca004372c527b70634566e7]
#    to [f0bce9c3cf4163a6909357c28a472f3738f77719]
# 
# patch "tests/t_cvsimport_manifest_cycle.at"
#  from []
#    to [43ecdf2a9b1a6e356715c675ab2600f274df262a]
# 
# patch "testsuite.at"
#  from [74588ac88436f19d8649499b2d21bec35a45908d]
#    to [65bf4966efddbaf88b676421f2433f85ea27753d]
# 
--- AUTHORS
+++ AUTHORS
@@ -57,6 +57,7 @@
   Sebastian Spaeth <address@hidden>
   Joel Reed <address@hidden>
   Timothy Brownawell <address@hidden>
+  Matthew Gregan <address@hidden>
 
 supporting files:
 -----------------
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,9 @@
+2005-04-27  Matthew Gregan  <address@hidden>
+
+	* tests/t_cvsimport_manifest_cycle.at: New test.
+	* testsuite.at: Add test.
+	* AUTHORS: Add self.
+
 2005-04-27  Nathaniel Smith  <address@hidden>
 
 	* AUTHORS: Add Timothy Brownawell.
--- tests/t_cvsimport_manifest_cycle.at
+++ tests/t_cvsimport_manifest_cycle.at
@@ -0,0 +1,41 @@
+#  -*- Autoconf -*-
+
+AT_SETUP([import from CVS, file deleted on head and branch])
+NEED_UNGZB64
+
+AT_XFAIL_IF(true)
+
+MONOTONE_SETUP
+
+CVSROOT=`pwd`/cvs-repository
+AT_CHECK(cvs -q -d $CVSROOT init)
+AT_CHECK(test -e $CVSROOT)
+AT_CHECK(test -e $CVSROOT/CVSROOT)
+AT_CHECK(test -e $CVSROOT/CVSROOT/history)
+
+AT_DATA(cvsfile.gz.enc, [H4sICLNeb0ICA2EsdgB9j8FuwyAQRM/sVyDlvgKcKHK50Er5gn4BgW1s1UBkSJr+fbGJ0laqKnEaZt7MDmQ9k6g0WOcoZw35MxzTlNnL8+vhSaLUMCX3njXPZR5d0eBSCBQLMxtuNADUNHhbiCkhJIodqh6VQtFjpzSzlzKkmYd0yaRZLtXIfS3VcJxtdAPVyki3wtaqCpMN1vcLQVa4xK3ETv6NOtzO3yRYILhdQCuy8Rbh58A9iqoIlHvsdg9qtrHYfwcut3rKDoy5Xz2lE5iZQroSfxsnQgOlOsGUYcy8PttkaAHZAtZ7Hunj8dUid8s6drUFmk/Eh7qEj7Ek3tb8DnwBs3bpVb4BAAA=
+])
+
+AT_CHECK(mkdir $CVSROOT/attest, [], [ignore])
+UNGZB64(cvsfile.gz.enc, cvsfile)
+# Autotest doesn't like files with commas in the name, so we rename it
+# ourselves.
+mv cvsfile $CVSROOT/attest/cvsfile,v
+
+AT_CHECK(cvs -d $CVSROOT co attest)
+TSHA0=`SHA1(attest/cvsfile)`
+
+# import into monotone and check presence of files
+
+AT_CHECK(MONOTONE --branch=testbranch cvs_import $CVSROOT/attest, [], [ignore], [ignore])
+
+AT_CHECK(MONOTONE cat file $TSHA0, [], [ignore])
+
+# also check that history is okay -- has a unique head, and it's the
+# right one.
+
+AT_CHECK(MONOTONE checkout --branch=testbranch mtcodir, [], [ignore], [ignore])
+AT_CHECK(cmp attest/cvsfile mtcodir/cvsfile)
+
+AT_CLEANUP
+
--- testsuite.at
+++ testsuite.at
@@ -585,3 +585,5 @@
 m4_include(tests/t_parents_children.at)
 m4_include(tests/t_automate_graph.at)
 m4_include(tests/t_i18n_file_data.at)
+m4_include(tests/t_cvsimport_manifest_cycle.at)
+