# 
# patch "ChangeLog"
#  from [2d02cfbe217ccc9cad2990dd7f31c99f5c960f87]
#    to [2750578847c5a885e5100f32b4fdced4bc687007]
# 
# patch "database_check.cc"
#  from [6ee48aaacf806b2650d15e43084de61ffe60f483]
#    to [a4c657c1f544061cd11935dd18ef5fea43e9accb]
# 
========================================================================
--- ChangeLog	2d02cfbe217ccc9cad2990dd7f31c99f5c960f87
+++ ChangeLog	2750578847c5a885e5100f32b4fdced4bc687007
@@ -1,8 +1,14 @@
 2005-08-13  Julio M. Merino Vidal  <address@hidden>
 
+	* database_check.cc: Remove trailing newline from error messages
+	when embedding them inside other strings, so that the trailing
+	closing parenthesis is printed correctly.
+
+2005-08-13  Julio M. Merino Vidal  <address@hidden>
+
 	* configure.ac: Add '-mt' as another possible suffix to detect the
 	Boost libraries.  It's very common when these libraries are built
-	with tghe "native naming layout".
+	with the "native naming layout".
 
 2005-08-11  Nathaniel Smith  <address@hidden>
 
========================================================================
--- database_check.cc	6ee48aaacf806b2650d15e43084de61ffe60f483
+++ database_check.cc	a4c657c1f544061cd11935dd18ef5fea43e9accb
@@ -505,9 +505,11 @@
       if (!revision.history_error.empty())
         {
           bad_history++;
+          std::string tmp = revision.history_error;
+          if (tmp[tmp.length() - 1] == '\n')
+            tmp.erase(tmp.length() - 1);
           P(F("revision %s has bad history (%s)\n")
-            % i->first
-            % revision.history_error); 
+            % i->first % tmp);
         }
 
       if (!revision.normalized)