# 
# 
# patch "ChangeLog"
#  from [7df197a606beb293d7f317ee33e8e50e800a0363]
#    to [20ddcad4fcef72deb257d9cf1769af16d9475233]
# 
# patch "sanity.cc"
#  from [d81f699c8daf70322c2fe440c7a366ac13aefda6]
#    to [46c1215ecd8cfd5d289f0f56c464e33644c178c5]
# 
============================================================
--- ChangeLog	7df197a606beb293d7f317ee33e8e50e800a0363
+++ ChangeLog	20ddcad4fcef72deb257d9cf1769af16d9475233
@@ -1,5 +1,10 @@
 2005-12-03  Nathaniel Smith  <address@hidden>
 
+	* sanity.cc (dump_buffer): If we dumped debug info, write out a
+	note asking that it be included in bug reports.
+
+2005-12-03  Nathaniel Smith  <address@hidden>
+
 	* schema_migration.cc (logged_sqlite3_exec): New function.
 	Use everywhere in this file.  Enables logging of migration
 	commands for debugging purposes.
============================================================
--- sanity.cc	d81f699c8daf70322c2fe440c7a366ac13aefda6
+++ sanity.cc	46c1215ecd8cfd5d289f0f56c464e33644c178c5
@@ -51,10 +51,12 @@
         {
           copy(logbuf.begin(), logbuf.end(), ostream_iterator<char>(out));
           copy(gasp_dump.begin(), gasp_dump.end(), ostream_iterator<char>(out));
-          ui.inform((F("wrote debugging log to %s") % filename).str());
+          ui.inform((F("wrote debugging log to %s"
+                       "if reporting a bug, please include this file")
+                     % filename).str());
         }
       else
-        ui.inform((F("failed to write debugging log to %s") % filename).str());
+        ui.inform((F("failed to write debugging log to %s\n") % filename).str());
     }
   else
     ui.inform("discarding debug log (maybe you want --debug or --dump?)");
@@ -106,9 +108,9 @@
   catch (std::exception & e)
     {
       ui.inform(F("fatal: formatter failed on %s:%d: %s")
-		% file
-		% line
-		% e.what());
+                % file
+                % line
+                % e.what());
       throw;
     }
 }
@@ -293,12 +295,12 @@
 void MusingBase::gasp(const std::string & objstr, std::string & out) const
 {
   out = (boost::format("----- begin '%s' (in %s, at %s:%d)\n"
-		       "%s"
-		       "-----   end '%s' (in %s, at %s:%d)\n")
-	 % name % func % file % line
-	 % objstr
-	 % name % func % file % line
-	 ).str();
+                       "%s"
+                       "-----   end '%s' (in %s, at %s:%d)\n")
+         % name % func % file % line
+         % objstr
+         % name % func % file % line
+         ).str();
 }