# 
# patch "automate.cc"
#  from [d903d93a220e17d405313d26ade13edefac07760]
#    to [61d2ab8f0c7ce519d9da943d1bece291405c0a30]
# 
# patch "commands.cc"
#  from [7509dbf34222515692475f0b74f406d3ec874e8e]
#    to [90adbc1395e018f6f314b3bc52861c1a4e583ac1]
# 
========================================================================
--- automate.cc	d903d93a220e17d405313d26ade13edefac07760
+++ automate.cc	61d2ab8f0c7ce519d9da943d1bece291405c0a30
@@ -1015,15 +1015,9 @@
       app.require_working_copy();
 
       // FIXME: this should be refactored
-      revision_id base_rid;
       roster_t roster;
-      get_base_revision(app, base_rid, roster);
       temp_node_id_source nis;
-      editable_roster_base er(roster, nis);
-      cset work;
-      get_work_cset(work);
-      work.apply_to(er);
-
+      get_current_roster(roster, nis, app);
       data dat;
       write_manifest_of_roster(roster, dat);
       output.write(dat().data(), dat().size());
========================================================================
--- commands.cc	7509dbf34222515692475f0b74f406d3ec874e8e
+++ commands.cc	90adbc1395e018f6f314b3bc52861c1a4e583ac1
@@ -1160,11 +1160,10 @@
 
   app.require_working_copy();
 
-  revision_id base_rid;
   roster_t base_roster;
   cset work;
 
-  get_base_revision(app, base_rid, base_roster);
+  get_base_roster(app, base_roster);
   get_work_cset(work);
 
   path_set paths;
@@ -1199,11 +1198,10 @@
 
   app.require_working_copy();
 
-  revision_id base_rid;
   roster_t base_roster;
   cset work;
   
-  get_base_revision(app, base_rid, base_roster);
+  get_base_roster(app, base_roster);
   get_work_cset(work);
 
   path_set paths;
@@ -3287,6 +3285,7 @@
 }
 
 /*
+// FIXME_ROSTERS: disabled until rewritten to use rosters
 CMD(explicit_merge, N_("tree"),
     N_("LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n"
       "LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH"),