# 
# 
# patch "ChangeLog"
#  from [8dc885edbcfd2a6b3e0f4bb987f688060cec2eda]
#    to [790874f7edd280504648db52fb184ee35a7a5a46]
# 
# patch "monotone.cc"
#  from [af5584575bd8cf33478f05f3d584e74badce7e34]
#    to [7d99a27548a2d774ea31b73fd02267e4779bfc18]
# 
============================================================
--- ChangeLog	8dc885edbcfd2a6b3e0f4bb987f688060cec2eda
+++ ChangeLog	790874f7edd280504648db52fb184ee35a7a5a46
@@ -1,3 +1,9 @@
+2006-04-05  Nathaniel Smith  <address@hidden>
+
+	* monotone.cc (cpp_main): MM() our command line, LC_ALL, and full
+	version, so that they are always included in dump and debug
+	files.
+
 2006-04-04  Nathaniel Smith  <address@hidden>
 
 	* mt_version.{cc,hh} (get_version, get_full_version): New
============================================================
--- monotone.cc	af5584575bd8cf33478f05f3d584e74badce7e34
+++ monotone.cc	7d99a27548a2d774ea31b73fd02267e4779bfc18
@@ -255,6 +255,9 @@
   try
   {
 
+  // set up some marked strings, so even if our logbuf overflows, we'll get
+  // this data in a crash.
+  std::string cmdline_string;
   {
     std::ostringstream cmdline_ss;
     for (int i = 0; i < argc; ++i)
@@ -263,12 +266,19 @@
           cmdline_ss << ", ";
         cmdline_ss << "'" << argv[i] << "'";
       }
-    L(FL("command line: %s\n") % cmdline_ss.str());
+    cmdline_string = cmdline_ss.str();
   }
+  MM(cmdline_string);
+  L(FL("command line: %s\n") % cmdline_string);
 
-  L(FL("set locale: LC_ALL=%s\n")
-    % (setlocale(LC_ALL, NULL) == NULL ? "n/a" : setlocale(LC_ALL, NULL)));
+  std::string locale_string = (setlocale(LC_ALL, NULL) == NULL ? "n/a" : setlocale(LC_ALL, NULL));
+  MM(locale_string);
+  L(FL("set locale: LC_ALL=%s\n") % locale_string);
 
+  std::string full_version_string;
+  get_full_version(full_version_string);
+  MM(full_version_string);
+
   // Set up secure memory allocation etc
   Botan::Init::initialize();
   Botan::set_default_allocator("malloc");