# 
# 
# patch "automate.cc"
#  from [5baa22129500e0c1421f8c9592266617892b857f]
#    to [5ca3b0044cc7259d0e6200a69041afc827bd16cb]
# 
============================================================
--- automate.cc	5baa22129500e0c1421f8c9592266617892b857f
+++ automate.cc	5ca3b0044cc7259d0e6200a69041afc827bd16cb
@@ -225,10 +225,10 @@
   if (args.size() > 1)
     throw usage(help_name);
 
-  roster_t base, current;
+  roster_t current;
+  parentage parents;
   temp_node_id_source nis;
-  E(false, F("FIXME_WORKMERGE"));
-//get_base_and_current_roster_shape(base, current, nis, app);
+  get_parentage_and_current_roster_shape(parents, current, nis, app);
 
   if (args.size() == 1)
     {
@@ -941,11 +941,12 @@
   if (args.size() == 0)
     {
       revision_set rev;
-      roster_t old_roster, new_roster;
+      roster_t new_roster;
+      std::vector<roster_t> old_rosters;
 
       app.require_working_copy(); 
       get_unrestricted_working_revision_and_rosters(app, rev, 
-                                                    old_roster, 
+                                                    old_rosters, 
                                                     new_roster);
       calculate_ident(rev, ident);
       write_revision_set(rev, dat);
@@ -983,13 +984,14 @@
 
   data dat;
   manifest_id mid;
-  roster_t old_roster, new_roster;
+  roster_t new_roster;
 
   if (args.size() == 0)
     {
+      std::vector<roster_t> old_rosters;
       revision_set rs;
       app.require_working_copy();
-      get_unrestricted_working_revision_and_rosters(app, rs, old_roster, new_roster);
+      get_unrestricted_working_revision_and_rosters(app, rs, old_rosters, new_roster);
     }
   else
     {