# 
# 
# patch "ChangeLog"
#  from [1ddb8c6d364c313121b7443f2070036431ca7257]
#    to [f58aae619a2fce8ec5dc17991401ab9cb6645e60]
# 
# patch "monotone.cc"
#  from [e2a095b54ab493c7b9d77e242949f74fbb75a404]
#    to [26f53f504ddb5bdf7670c023815684c2f4a96fbb]
# 
# patch "monotone.texi"
#  from [a0ab7a5d8444dde9030ea1f9800daa0cd16bc495]
#    to [5790199cf92c6d31f3de1a901c78a457e6399e71]
# 
# patch "options_list.hh"
#  from [4b9a7e0040d1e356b56ca6908674b8eacbd93a6a]
#    to [7f848bd6cc61db450eec2b2b8d3af196c2aded71]
# 
# patch "testsuite.lua"
#  from [94338590190082fc40303c9cec4ce756526ca5cf]
#    to [3b1872bd138323a7d1ec7cdab58ecf3fa99f448b]
# 
============================================================
--- ChangeLog	1ddb8c6d364c313121b7443f2070036431ca7257
+++ ChangeLog	f58aae619a2fce8ec5dc17991401ab9cb6645e60
@@ -1,3 +1,12 @@
+2006-10-03  Evan Deaubl  <address@hidden>
+
+	* monotone.cc, options_list.hh: Added ability to specify
+	multiple --message arguments.
+	* monotone.texi: Added documentation for multiple --message
+	arguments.
+	* tests/multiple_message_commit/__driver__.lua, testsuite.lua:
+	Added integration test for multiple --message arguments.
+	
 2006-10-09  Richard Levitte  <address@hidden>
 
 	* po/sv.po: 35 fuzzies cleared,
============================================================
--- monotone.cc	e2a095b54ab493c7b9d77e242949f74fbb75a404
+++ monotone.cc	26f53f504ddb5bdf7670c023815684c2f4a96fbb
@@ -38,6 +38,7 @@
 #include "options.hh"
 #include "paths.hh"
 #include "sha1.hh"
+#include "simplestring_xform.hh"
 
 using std::cout;
 using std::cerr;
@@ -432,7 +433,9 @@ cpp_main(int argc, char ** argv)
 
       if (option::message.given(vm))
         {
-          app.set_message(option::message.get(vm));
+          string combined_message = "";
+          join_lines(option::message.get(vm), combined_message);
+          app.set_message(combined_message);
           app.set_is_explicit_option(option::message());
         }
 
============================================================
--- monotone.texi	a0ab7a5d8444dde9030ea1f9800daa0cd16bc495
+++ monotone.texi	5790199cf92c6d31f3de1a901c78a457e6399e71
@@ -4200,14 +4200,14 @@ @section Workspace
 
 @item mtn commit
 @item mtn ci
address@hidden mtn commit address@hidden
address@hidden mtn ci address@hidden
address@hidden mtn commit address@hidden address@hidden
address@hidden mtn ci address@hidden address@hidden
 @itemx mtn commit address@hidden
 @itemx mtn ci address@hidden
 @itemx mtn commit @var{pathname...}
 @itemx mtn ci @var{pathname...}
address@hidden mtn commit address@hidden @var{pathname...} 
address@hidden mtn ci address@hidden @var{pathname...} 
address@hidden mtn commit address@hidden address@hidden @var{pathname...} 
address@hidden mtn ci address@hidden address@hidden @var{pathname...} 
 @itemx mtn commit address@hidden @var{pathname...} 
 @itemx mtn ci address@hidden @var{pathname...} 
 
@@ -4244,6 +4244,10 @@ @section Workspace
 @option{--message-file} actually specifies the name of the file containing
 the log message, while @option{--message} provides it directly.
 
+Multiple @option{--message} options may be provided on the command line.
+The log message will be formed by concatenating the @option{--message}
+options provided, with each one starting at the beginning of a new line.
+
 The @file{_MTN/log} file can be edited by the user during their daily work
 to record the changes made to the workspace. When running the
 @command{commit} command without a @var{logmsg} supplied, the contents
============================================================
--- options_list.hh	4b9a7e0040d1e356b56ca6908674b8eacbd93a6a
+++ options_list.hh	7f848bd6cc61db450eec2b2b8d3af196c2aded71
@@ -35,7 +35,7 @@ COPT(last, "last", long, gettext_noop("l
 COPT(external_diff_args, "diff-args", string, gettext_noop("argument to pass external diff hook"));
 COPT(key_to_push, "key-to-push", vector<string>, gettext_noop("push the specified key even if it hasn't signed anything"));
 COPT(last, "last", long, gettext_noop("limit log output to the last number of entries"));
-COPT(message, "message,m", string, gettext_noop("set commit changelog message"));
+COPT(message, "message,m", vector<string>, gettext_noop("set commit changelog message"));
 COPT(missing, "missing", nil, gettext_noop("perform the operations for files missing from workspace"));
 COPT(msgfile, "message-file", string, gettext_noop("set filename containing commit changelog message"));
 COPT(next, "next", long, gettext_noop("limit log output to the next number of entries"));
============================================================
--- testsuite.lua	94338590190082fc40303c9cec4ce756526ca5cf
+++ testsuite.lua	3b1872bd138323a7d1ec7cdab58ecf3fa99f448b
@@ -682,3 +682,4 @@ table.insert(tests, "pivot_root_to_new_d
 table.insert(tests, "i18n_commit_messages")
 table.insert(tests, "ws_ops_with_wrong_node_type")
 table.insert(tests, "pivot_root_to_new_dir")
+table.insert(tests, "multiple_message_commit")