# 
# 
# patch "ChangeLog"
#  from [704cde96629adbf1a5bff2b43cae1a4e1dccdcf5]
#    to [49448ad317b1c775d85e45c0d740b405e125e541]
# 
# patch "database.cc"
#  from [b6d0d424585587bb8b0ed480342b1a7b5c7830f3]
#    to [5ade379be3e0877d29e5e01f4ddb2be0ba0175c8]
# 
============================================================
--- ChangeLog	704cde96629adbf1a5bff2b43cae1a4e1dccdcf5
+++ ChangeLog	49448ad317b1c775d85e45c0d740b405e125e541
@@ -1,3 +1,8 @@
+2006-01-13  Nathaniel Smith  <address@hidden>
+
+	* database.cc (check_rosterified): Clarify message emitted when db
+	has not been rosterified.
+
 2006-01-12  Nathaniel Smith  <address@hidden>
 
 	* po/Makevars (XGETTEXT_OPTIONS): More fiddling to make
============================================================
--- database.cc	b6d0d424585587bb8b0ed480342b1a7b5c7830f3
+++ database.cc	5ade379be3e0877d29e5e01f4ddb2be0ba0175c8
@@ -106,8 +106,12 @@
       fetch(res, one_col, any_rows, rosters_query.c_str());
       N (res.size() != 0,
          F("database %s contains revisions but no rosters\n"
-           "try 'monotone db rosterify' to add rosters\n"
-           "(this is irreversible; you may want to make a backup copy first)")
+           "if you are a project leader or doing local testing:\n"
+           "  see the file UPGRADE for instructions on upgrading.\n"
+           "if you are not a project leader:\n"
+           "  wait for a leader to migrate project data, and then\n"
+           "  pull into a fresh database.\n"
+           "sorry about the inconvenience.")
          % filename);
     }
 }