# 
# 
# patch "ChangeLog"
#  from [87867412708f689af35f8d9c36fc397f6b33a52e]
#    to [643eb4c8d8610feacabfb230cd5d83cccc728183]
# 
# patch "schema_migration.cc"
#  from [c802e1820aa8381b39dde2b5fece6c29c5256efd]
#    to [25babf72cf8481272d90e00dc6694835a6c7c12d]
# 
============================================================
--- ChangeLog	87867412708f689af35f8d9c36fc397f6b33a52e
+++ ChangeLog	643eb4c8d8610feacabfb230cd5d83cccc728183
@@ -1,5 +1,11 @@
 2006-02-26  Nathaniel Smith  <address@hidden>
 
+	* schema_migration.cc (migrate): Provide a little more feedback
+	during migration, so it doesn't look like it's taking minutes and
+	minutes just to "calculate necessary migration steps".
+
+2006-02-26  Nathaniel Smith  <address@hidden>
+
 	* roster_merge.cc: Update notes on tests.
 
 2006-02-25  Nathaniel Smith  <address@hidden>
============================================================
--- schema_migration.cc	c802e1820aa8381b39dde2b5fece6c29c5256efd
+++ schema_migration.cc	25babf72cf8481272d90e00dc6694835a6c7c12d
@@ -225,6 +225,7 @@
           {
             E(logged_sqlite3_exec(sql, "BEGIN EXCLUSIVE", NULL, NULL, NULL) == SQLITE_OK,
               F("error at transaction BEGIN statement"));
+            P(F("migrating data"));
             migrating = true;
           }
 
@@ -236,8 +237,7 @@
             calculate_schema_id(sql, curr);
             if (curr != i->first)
               {
-                if (migrating)
-                  logged_sqlite3_exec(sql, "ROLLBACK", NULL, NULL, NULL);
+                logged_sqlite3_exec(sql, "ROLLBACK", NULL, NULL, NULL);
                 I(false);
               }