# 
# patch "ChangeLog"
#  from [15a4c07e2c8deb7fbd722aa5df4cf9be5a8121b9]
#    to [bccbf95b7b998e6d0289f81fd5d367c348734925]
# 
# patch "commands.cc"
#  from [96ab0962d109727273cf22e001dae3f65df3b9bb]
#    to [a30b0c61b1635b2a61b130e9485d591a6882aefd]
# 
========================================================================
--- ChangeLog	15a4c07e2c8deb7fbd722aa5df4cf9be5a8121b9
+++ ChangeLog	bccbf95b7b998e6d0289f81fd5d367c348734925
@@ -1,5 +1,13 @@
 2005-08-26  Nathaniel Smith  <address@hidden>
 
+	* commands.cc (get_log_message): Make the log message commentary a
+	little more descriptive for people who may not know what a log
+	message is...
+	(commit): When canceling a commit due to empty log message, say
+	so.
+
+2005-08-26  Nathaniel Smith  <address@hidden>
+
 	* std_hooks.lua: Check for both "vi" and "notepad.exe" as fallback
 	editors.  If no editor was found, print a helpful message instead
 	of just running "vi" anyway.  Print a message if the editor exited
========================================================================
--- commands.cc	96ab0962d109727273cf22e001dae3f65df3b9bb
+++ commands.cc	a30b0c61b1635b2a61b130e9485d591a6882aefd
@@ -365,7 +365,8 @@
   write_revision_set(cs, summary);
   read_user_log(user_log_message);
   commentary += "----------------------------------------------------------------------\n";
-  commentary += _("Enter Log. Lines beginning with `MT:' are removed automatically\n");
+  commentary += _("Enter a description of this change.\n"
+                  "Lines beginning with `MT:' are removed automatically.\n");
   commentary += "\n";
   commentary += summary();
   commentary += "----------------------------------------------------------------------\n";
@@ -2353,7 +2354,7 @@
     {
       get_log_message(rs, app, log_message);
       N(log_message.find_first_not_of(" \r\t\n") != string::npos,
-        F("empty log message"));
+        F("empty log message; commit canceled"));
       // we write it out so that if the commit fails, the log
       // message will be preserved for a retry
       write_user_log(data(log_message));