#
#
# add_file "tests/commit_using__MTN_log/commit_log_modified_return.lua"
#  content [a9af6de4500c2fddab1853eebc185a055156f8cd]
#
# patch "tests/checkout_creates__MTN_log/commit_log.lua"
#  from [09c926209c317efc447dbe6448fe891c2d86e958]
#    to [a9af6de4500c2fddab1853eebc185a055156f8cd]
#
# patch "tests/commit_using__MTN_log/__driver__.lua"
#  from [527603c2d0931a7576c34088d085ac689cf93236]
#    to [a9b708bd811300cc5c4ca78b932f50f7f93341cf]
#
# patch "tests/i18n_commit_messages/extra_hooks.lua"
#  from [2fdc779f672bc3e26ec390f6413f2d13778bc30d]
#    to [ca81a1f657530409dbbe1ec50b52a9e253b0f411]
#
============================================================
--- tests/commit_using__MTN_log/commit_log_modified_return.lua	a9af6de4500c2fddab1853eebc185a055156f8cd
+++ tests/commit_using__MTN_log/commit_log_modified_return.lua	a9af6de4500c2fddab1853eebc185a055156f8cd
@@ -0,0 +1,6 @@
+function edit_comment(summary, user_log_file)
+  -- this used to just return the variable user_log_file,
+  -- but now must return the original entry without the 'magic' line.
+  -- this avoids a failing test after the 'magic line' patch
+  return "Log Entry"
+end
============================================================
--- tests/checkout_creates__MTN_log/commit_log.lua	09c926209c317efc447dbe6448fe891c2d86e958
+++ tests/checkout_creates__MTN_log/commit_log.lua	a9af6de4500c2fddab1853eebc185a055156f8cd
@@ -1,3 +1,6 @@ function edit_comment(summary, user_log_
 function edit_comment(summary, user_log_file)
-  return user_log_file
+  -- this used to just return the variable user_log_file,
+  -- but now must return the original entry without the 'magic' line.
+  -- this avoids a failing test after the 'magic line' patch
+  return "Log Entry"
 end
============================================================
--- tests/commit_using__MTN_log/__driver__.lua	527603c2d0931a7576c34088d085ac689cf93236
+++ tests/commit_using__MTN_log/__driver__.lua	a9b708bd811300cc5c4ca78b932f50f7f93341cf
@@ -26,4 +26,4 @@ check(mtn("ls", "certs", tsha), 0, true,
 check(exists("_MTN/log"))
 check(fsize("_MTN/log") == 0)
 check(mtn("ls", "certs", tsha), 0, true, false)
+check(qgrep("Log Entry", "stdout"))
-check(qgrep('Log entry', "stdout"))
============================================================
--- tests/i18n_commit_messages/extra_hooks.lua	2fdc779f672bc3e26ec390f6413f2d13778bc30d
+++ tests/i18n_commit_messages/extra_hooks.lua	ca81a1f657530409dbbe1ec50b52a9e253b0f411
@@ -7,6 +7,14 @@ function edit_comment(basetext, user_log

 -- this should get the commit message in current locale
 function edit_comment(basetext, user_log_message)
+   -- we now mangle this to become the same as the content of the text file,
+   -- as it will have the 'magic line' prepended to it, which will cause the
+   -- test to fail.
+   -- this is only done if the message was pre-specified in _MTN/log
+   if user_log_message ~= "" then
+      user_log_message = "¥ï¡¼¥¯¥¹¥Ú¡¼¥¹¤¬É¬ÍפǤ¹¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
+   end
+
    wanted = slurp("euc-jp.txt")

    if string.find(basetext, wanted) ~= nil then