# 
# patch "ChangeLog"
#  from [5af774647ef89a05a28f22187696844d1068aada]
#    to [64a6f98697863f328c8ba3f6bf8683fda4b3c827]
# 
# patch "database.cc"
#  from [e164fc8fa3aae345a62da1bade010e1e87a97e66]
#    to [b5fca6388cdb1741ca3301902e88de4ed04d5434]
# 
========================================================================
--- ChangeLog	5af774647ef89a05a28f22187696844d1068aada
+++ ChangeLog	64a6f98697863f328c8ba3f6bf8683fda4b3c827
@@ -1,5 +1,10 @@
 2005-08-24  Nathaniel Smith  <address@hidden>
 
+	* database.cc (assert_sqlite3_ok): Remove accidentally-left-in
+	format string argument.
+
+2005-08-24  Nathaniel Smith  <address@hidden>
+
 	* revision.cc (check_sane_history): Add MM's for calculated
 	changesets.
 
========================================================================
--- database.cc	e164fc8fa3aae345a62da1bade010e1e87a97e66
+++ database.cc	b5fca6388cdb1741ca3301902e88de4ed04d5434
@@ -182,7 +182,7 @@
     }
   // if the last message is empty, the \n will be stripped off too
   E(errcode == SQLITE_OK,
-    F("sqlite error: %s\n%s") % errcode % errmsg % auxiliary_message);
+    F("sqlite error: %s\n%s") % errmsg % auxiliary_message);
 }
 
 struct sqlite3 *