# 
# patch "ChangeLog"
#  from [578d20a398a68f521d13deeb5ac94f9fb5b2678a]
#    to [8643f6f6407ead973692bf1d7701047196126d82]
# 
# patch "Makefile.am"
#  from [18e08f50175c9afc7e14cfe2f3f540b4604c1253]
#    to [5ea107dd81d19c55c2e5982bb1cd56d4ebf60ee5]
# 
# patch "tests/t_short_opts.at"
#  from [8821d4ee9cd72edc1cc7924f0e5bf7a08fc88481]
#    to [65969eb19ec23c4f37e9583f6556104ac8e9f6d2]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,11 @@
 2005-05-21  Matt Johnston  <address@hidden>
 
+	* tests/t_short_opts.at: remove the saved MT/log message
+	from the failed commit.
+	* Makefile.am: MAKEINFOFALGS to MAKEINFOFLAGS
+
+2005-05-21  Matt Johnston  <address@hidden>
+
 	* commands.cc (commit): write the log message to MT/log
 	during the commit, so it will be available later if the commit
 	fails.
--- Makefile.am
+++ Makefile.am
@@ -296,7 +296,7 @@
              win32/monotone.iss \
              $(wildcard $(srcdir)/debian/*)
 
-MAKEINFOFALGS=-I $(top_builddir)
+MAKEINFOFLAGS=-I $(top_builddir)
 
 monotone.pdf: monotone.texi $(PDF_FIGURES)
 
--- tests/t_short_opts.at
+++ tests/t_short_opts.at
@@ -20,6 +20,9 @@
 # check it won't work with a bad key
 AT_CHECK(SHORT_MONOTONE -k address@hidden -b test.branch commit -d test.db -m happy, [1], [ignore], [ignore])
 
+# the failed log will have been saved
+AT_CHECK(rm MT/log)
+
 # and it does work with a key
 AT_CHECK(SHORT_MONOTONE -k address@hidden -b test.branch commit -d test.db -m happy, [], [ignore], [ignore])