# 
# patch "ChangeLog"
#  from [c931e8ff746fbc8f4263a3dbf738561adff2346c]
#    to [b0becd62fa2ac515d9b5c7eaa86b256cfb720761]
# 
# patch "cert.hh"
#  from [cecfad39f70d66bade08f08e08f023325c611b0a]
#    to [3fdb0157a21c4b2c67a95c911c8e64109b32e068]
# 
# patch "database.cc"
#  from [034cc97a43dccb1c7be5388339af9f33fe6597e4]
#    to [c69c22cfd98aa2c979d7a93760411049578d9495]
# 
========================================================================
--- ChangeLog	c931e8ff746fbc8f4263a3dbf738561adff2346c
+++ ChangeLog	b0becd62fa2ac515d9b5c7eaa86b256cfb720761
@@ -1,3 +1,9 @@
+2005-10-20  Nathaniel Smith  <address@hidden>
+
+	* cert.hh (find_common_ancestor): Remove dead declaration.
+	* database.cc (check_schema): Improve schema mismatch error
+	message.
+
 2005-10-20  Richard Levitte  <address@hidden>
 
 	* tests/t_database_sig_cleanup.at: Sleep for a couple of seconds,
========================================================================
--- cert.hh	cecfad39f70d66bade08f08e08f023325c611b0a
+++ cert.hh	3fdb0157a21c4b2c67a95c911c8e64109b32e068
@@ -86,13 +86,6 @@
                  app_state & app,
                  std::set<revision_id> & heads);
 
-bool 
-find_common_ancestor(revision_id const & left,
-                     revision_id const & right,
-                     revision_id & anc,
-                     app_state & app);
-
-
 // we also define some common cert types, to help establish useful
 // conventions. you should use these unless you have a compelling
 // reason not to.
========================================================================
--- database.cc	034cc97a43dccb1c7be5388339af9f33fe6597e4
+++ database.cc	c69c22cfd98aa2c979d7a93760411049578d9495
@@ -83,9 +83,11 @@
   string db_schema_id;  
   calculate_schema_id (__sql, db_schema_id);
   N (schema == db_schema_id,
-     F("database schemas do not match: "
-       "wanted %s, got %s. try migrating database") 
-     % schema % db_schema_id);
+     F("layout of database %s doesn't match this version of monotone\n"
+       "wanted schema %s, got %s\n"
+       "try 'monotone db migrate' to upgrade\n"
+       "(this is irreversible; you may want to make a backup copy first)")
+     % filename % schema % db_schema_id);
 }
 
 // sqlite3_value_text gives a const unsigned char * but most of the time