#
# old_revision [133d7c3ff21229143d27ccd7cca5d64d2b117335]
#
# patch "cmd_ws_commit.cc"
#  from [c526804d60744f302780eaf3fd89663836591710]
#    to [675d50749b86961c856607852b288f4d601d6553]
#
============================================================
--- cmd_ws_commit.cc	c526804d60744f302780eaf3fd89663836591710
+++ cmd_ws_commit.cc	675d50749b86961c856607852b288f4d601d6553
@@ -118,16 +118,25 @@ get_log_message_interactively(revision_t
   commentary_str += string(70, '-') + "\n";
 
   external commentary(commentary_str);
+  
+  utf8 message_file_message;
+  app.work.read_message_file(message_file_message);
 
   utf8 user_log_message;
   app.work.read_user_log(user_log_message);
 
-  //if the _MTN/log file was non-empty, we'll append the 'magic' line
   utf8 user_log;
+  // if the .mtn-message is non-empty we will insert this first into
+  // the user_log. The contents of _MTN/log should be appended at the
+  // end.
+  if (message_file_message().length() > 0)
+    user_log = message_file_message;
+    
+  // if the _MTN/log file was non-empty, we'll append the 'magic' line
   if (user_log_message().length() > 0)
-    user_log = utf8( magic_line + "\n" + user_log_message());
+    user_log = utf8( magic_line + "\n" + user_log() + "\n" + user_log_message());
   else
-    user_log = user_log_message;
+    user_log = utf8( user_log() + "\n" + user_log_message());
 
   external user_log_message_external;
   utf8_to_system_best_effort(user_log, user_log_message_external);