# 
# patch "ChangeLog"
#  from [675c52e29c4806ef33adb23c47ac4ebc27eba2a4]
#    to [62f20ca5251bfa3ca97117e60eadddc9bb8f1b5f]
# 
# patch "tests/t_add_intermediate_MT_path.at"
#  from [8f0e4b7bcc4c3760e358f76eac7bad4f909d1afd]
#    to [4c5f65b5f92f5b3c897b694de2179138826f5b8c]
# 
# patch "tests/t_cvsimport3.at"
#  from [3c381dc5ef409da2a3a8585061508b43d67c4f58]
#    to [7a5e68124be1da212a3b89c64f098446891952e2]
# 
# patch "tests/t_delete_dir.at"
#  from [de453c4f454f6dc63d73b80c24245229f328ec80]
#    to [f9a621cdda6b3fa05291d055d0cb2a7971705c79]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,8 +1,14 @@
 2005-05-11  Matt Johnston  <address@hidden>
 
+	* tests/t_add_intermediate_MT_path.at: remove the drop dir part
+	* tests/t_delete_dir.at: add a note about re-enabling the above test
+	* tests/t_cvsimport3.at: ignore stderr
+
+2005-05-11  Matt Johnston  <address@hidden>
+
 	* rcs_import.cc (find_branchpoint): if a branch is derived from two 
 	differing parent branches, take the one closest to the trunk.
-	* t_cvsimport3.at: add a test for cvs_importing where branches
+	* tests/t_cvsimport3.at: add a test for cvs_importing where branches
 	come off a vendor import.
 	* testsuite.at: add it
 
--- tests/t_add_intermediate_MT_path.at
+++ tests/t_add_intermediate_MT_path.at
@@ -60,13 +60,14 @@
 
 # recursive drop
 
-AT_CHECK(MONOTONE drop dir1, [], [ignore], [ignore])
-
+#### FIXME This should be re-enabled when delete_dir works ####
+#AT_CHECK(MONOTONE drop dir1, [], [ignore], [ignore])
 # we expect a non-zero exist status here because directory deletion is
 # broken once that's fixed this should fail and can be changed to
 # expect commit to work
 
-AT_CHECK(MONOTONE commit, [3], [ignore], [ignore])
+#### FIXME ###
+#AT_CHECK(MONOTONE commit, [3], [ignore], [ignore])
 
 AT_CHECK(MONOTONE checkout outdir4, [], [ignore], [ignore])
 # and these will need updating to all be ! -e too
--- tests/t_cvsimport3.at
+++ tests/t_cvsimport3.at
@@ -84,7 +84,7 @@
 AT_CHECK(cvs -d $CVSROOT commit -m 'commit on branch' testsrc, [], [ignore], [ignore])
 
 # and create some mainline changes after the branch
-AT_CHECK(cvs -d $CVSROOT up -A testsrc, [], [ignore])
+AT_CHECK(cvs -d $CVSROOT up -A testsrc, [], [ignore], [ignore])
 AT_CHECK(cp changelog.2 testsrc/changelog)
 AT_CHECK(cvs -d $CVSROOT commit -m 'commit on mainline after branch' testsrc, [], [ignore], [ignore])
 
--- tests/t_delete_dir.at
+++ tests/t_delete_dir.at
@@ -1,7 +1,9 @@
 AT_SETUP([(imp) deleting directories])
 MONOTONE_SETUP
 
 # This test is a bug report
+# TODO: when this is fixed, re-enabled the drop dir part of 
+# t_add_intermediate_MT_path.at
 AT_XFAIL_IF(true)
 
 # Directory deletion is currently completely broken.