#
#
# patch "automate.cc"
#  from [abe7be2d0ab2c2fe451d84f81c1f86b51b256b09]
#    to [b8943689152840aa05ca214dcc6240c1c4cc1386]
# 
# patch "merge.cc"
#  from [56dbf15437f8e66c919ee29a36b1ed6a2d914581]
#    to [21d74edb8e5adefa0a5f3848321003facf32a4f1]
#
============================================================
--- automate.cc	abe7be2d0ab2c2fe451d84f81c1f86b51b256b09
+++ automate.cc	b8943689152840aa05ca214dcc6240c1c4cc1386
@@ -1227,9 +1227,10 @@ CMD_AUTOMATE(get_current_revision, N_("[
   revision_t rev;
   cset excluded;
 
+  database db(app);
   workspace work(app);
-  work.get_parent_rosters(old_rosters);
-  work.get_current_roster_shape(new_roster, nis);
+  work.get_parent_rosters(db, old_rosters);
+  work.get_current_roster_shape(db, nis, new_roster);
 
   node_restriction mask(args_to_paths(args),
                         args_to_paths(app.opts.exclude_patterns),
============================================================
--- merge.cc	56dbf15437f8e66c919ee29a36b1ed6a2d914581
+++ merge.cc	21d74edb8e5adefa0a5f3848321003facf32a4f1
@@ -167,11 +167,9 @@ resolve_merge_conflicts(lua_hooks & lua,
           P(F("%d content conflicts require user intervention") % remaining);
           result.report_file_content_conflicts(left_roster, right_roster, adaptor);
 
-          try_to_merge_files(app, left_roster, right_roster,
+          try_to_merge_files(lua, left_roster, right_roster,
                              result, adaptor, user_merge);
         }
-
-      try_to_merge_files(lua, left_roster, right_roster,
     }
 
   E(result.is_clean(),