# 
# patch "ChangeLog"
#  from [ba74478d8f8cd6c0f1fc8d1ea581f8498ab6582c]
#    to [95c02174701d3536590fd1fe491af66703b9e112]
# 
# patch "tests/t_commit_message_file.at"
#  from [f09e3f925f53d49d5bcd0d4e3d7673b328485331]
#    to [a44df1257c0a0400d00f6876f1c82eb64b0466ac]
# 
========================================================================
--- ChangeLog	ba74478d8f8cd6c0f1fc8d1ea581f8498ab6582c
+++ ChangeLog	95c02174701d3536590fd1fe491af66703b9e112
@@ -1,5 +1,9 @@
 2005-08-11  Nathaniel Smith  <address@hidden>
 
+	* tests/t_commit_message_file.at: Un-double file contents.
+
+2005-08-11  Nathaniel Smith  <address@hidden>
+
 	* lua.cc (ok, extract_str, extract_int, extract_double)
 	(extract_bool): Add more logging.
 
========================================================================
--- tests/t_commit_message_file.at	f09e3f925f53d49d5bcd0d4e3d7673b328485331
+++ tests/t_commit_message_file.at	a44df1257c0a0400d00f6876f1c82eb64b0466ac
@@ -73,78 +73,3 @@
 AT_CHECK(MONOTONE --branch=testbranch --rcfile=commit_log.lua commit --message-file=msgfile.txt, [1], [ignore], [ignore])
 
 AT_CLEANUP
-AT_SETUP([commit with --message-file])
-
-MONOTONE_SETUP
-
-AT_CHECK(rm -f MT/log)
-
-#--------------------
-#first, verify that --message-file actually works
-#--------------------
-
-AT_DATA(input.txt, [version 0 of the file
-])
-
-AT_CHECK(MONOTONE add input.txt, [], [ignore], [ignore])
-
-AT_DATA(msgfile.txt, [this commit uses the --message-file option
-])
-
-AT_CHECK(MONOTONE --branch=testbranch commit --message-file=msgfile.txt, [], [ignore], [ignore])
-
-TSHA=`BASE_REVISION`
-AT_CHECK(MONOTONE ls certs $TSHA, [], [stdout], [ignore])
-AT_CHECK(grep -q 'this commit uses the --message-file option' stdout, [])
-
-#--------------------
-#also with a file coming outside the working copy
-#--------------------
-AT_CHECK(MONOTONE setup alt_wrk, [], [ignore], [ignore])
-
-AT_DATA(alt_wrk/input1.txt, [files... files...
-])
-
-AT_DATA(message-out-of-copy.txt, [out out out 
-])
-
-AT_CHECK(cd alt_wrk && MONOTONE add input1.txt, [], [ignore], [ignore])
-
-AT_CHECK(cd alt_wrk && MONOTONE --branch=outbranch commit --message-file=../message-out-of-copy.txt, [], [ignore], [ignore])
-
-TSHA=`cd alt_wrk && BASE_REVISION`
-AT_CHECK(cd alt_wrk && MONOTONE ls certs $TSHA, [], [stdout], [ignore])
-AT_CHECK(grep -q 'out out out' stdout, [])
-
-#--------------------
-#start with the failures: non existing file
-#--------------------
-AT_DATA(input2.txt, [another file
-])
-
-AT_CHECK(MONOTONE add input2.txt, [], [ignore], [ignore])
-
-AT_CHECK(MONOTONE --branch=testbranch commit --message-file=to-be-or-not-to-be.txt, [1], [ignore], [ignore])
-
-#--------------------
-#then verify that --message and --message-file together cause an error
-#--------------------
-
-AT_CHECK(MONOTONE --branch=testbranch commit --message-file=msgfile.txt --message="also a message", [1], [ignore], [ignore])
-
-# --------------------
-# finally, --message-file and a filled MT/log should also fail
-# --------------------
-
-AT_DATA(commit_log.lua, [
-function edit_comment(summary, user_log_file)
-  return user_log_file
-end
-])
-
-AT_DATA(MT/log, [Log entry
-])
-
-AT_CHECK(MONOTONE --branch=testbranch --rcfile=commit_log.lua commit --message-file=msgfile.txt, [1], [ignore], [ignore])
-
-AT_CLEANUP