# 
# patch "ChangeLog"
#  from [5b9df326a0e2ac3a7134c69b343b8d11fa6fc46f]
#    to [ab520dcd507d52193559d62485d56e66e75474a6]
# 
# patch "database.cc"
#  from [4d7dd8ca20b92ba5cb698e7243253680b11361f8]
#    to [99621dc8dd3b871fc41204945906db116111519d]
# 
========================================================================
--- ChangeLog	5b9df326a0e2ac3a7134c69b343b8d11fa6fc46f
+++ ChangeLog	ab520dcd507d52193559d62485d56e66e75474a6
@@ -1,5 +1,9 @@
 2005-08-26  Nathaniel Smith  <address@hidden>
 
+	* database.cc (open): Convert stray line to paths.cc.
+
+2005-08-26  Nathaniel Smith  <address@hidden>
+
 	* change_set.cc (move_files_from_tmp_top_down): Typo.
 
 	* file_io.cc (move_path): New function.
========================================================================
--- database.cc	4d7dd8ca20b92ba5cb698e7243253680b11361f8
+++ database.cc	99621dc8dd3b871fc41204945906db116111519d
@@ -2459,7 +2459,7 @@
   error = sqlite3_open(filename.as_external().c_str(), &__sql);
 
   N(!error, (F("could not open database '%s': %s")
-             % filename() % string(sqlite3_errmsg(__sql))));
+             % filename % string(sqlite3_errmsg(__sql))));
 }