#
#
# patch "migrate_ancestry.cc"
#  from [7990d56f09d8c76fdc33f71700780b4634504345]
#    to [b1025e7912507fbe7ca9098ccf87c04d6dccefad]
#
============================================================
--- migrate_ancestry.cc	7990d56f09d8c76fdc33f71700780b4634504345
+++ migrate_ancestry.cc	b1025e7912507fbe7ca9098ccf87c04d6dccefad
@@ -982,14 +982,14 @@ static void
 }
 
 static void
-regenerate_rosters(database & db)
+regenerate_heights(database & db)
 {
-  P(F("regenerating cached rosters"));
+  P(F("regenerating cached heights"));
   db.ensure_open_for_cache_reset();
 
   {
     transaction_guard guard(db);
-    db.delete_existing_rosters();
+    db.delete_existing_heights();
 
     vector<revision_id> sorted_ids;
     allrevs_toposorted(db, sorted_ids);
@@ -1003,24 +1003,24 @@ regenerate_rosters(database & db)
         revision_t rev;
         revision_id const & rev_id = *i;
         db.get_revision(rev_id, rev);
-        db.put_roster_for_revision(rev_id, rev);
+        db.put_height_for_revision(rev_id, rev);
         ++done;
       }
 
     guard.commit();
   }
-  P(F("finished regenerating cached rosters"));
+  P(F("finished regenerating cached heights"));
 }
 
 static void
-regenerate_heights(database & db)
+regenerate_rosters(database & db)
 {
-  P(F("regenerating cached heights"));
+  P(F("regenerating cached rosters"));
   db.ensure_open_for_cache_reset();
 
   {
     transaction_guard guard(db);
-    db.delete_existing_heights();
+    db.delete_existing_rosters();
 
     vector<revision_id> sorted_ids;
     allrevs_toposorted(db, sorted_ids);
@@ -1034,13 +1034,13 @@ regenerate_heights(database & db)
         revision_t rev;
         revision_id const & rev_id = *i;
         db.get_revision(rev_id, rev);
-        db.put_height_for_revision(rev_id, rev);
+        db.put_roster_for_revision(rev_id, rev);
         ++done;
       }
 
     guard.commit();
   }
-  P(F("finished regenerating cached heights"));
+  P(F("finished regenerating cached rosters"));
 }
 
 static void
@@ -1114,10 +1114,10 @@ regenerate_caches(database & db, regen_c
 {
   I(type != regen_none);
 
+  if (type == regen_all || type == regen_heights)
+    regenerate_heights(db);
   if (type == regen_all || type == regen_rosters)
     regenerate_rosters(db);
-  if (type == regen_all || type == regen_heights)
-    regenerate_heights(db);
   if (type == regen_all || type == regen_branches)
     regenerate_branches(db);
   if (type == regen_all || type == regen_file_sizes)