#
#
# patch "cmd_netsync.cc"
#  from [39a96b273f26950ce8701dd041994f5c0b254877]
#    to [92bc91c7137e339e086b3ab761f1aed5df203143]
# 
# patch "cmd_ws_commit.cc"
#  from [ca4c6f38c8f27580b0a4ba2f142f76ba5c957cc9]
#    to [e21e2bb8831ce7e62bc428cf32ae10931b5e73e8]
# 
# patch "merge.cc"
#  from [da50821577d3818bdabac10a8ae77844b6774bda]
#    to [a4cdad82820a961f6a82c450bc620c5db2bd5eb9]
#
============================================================
--- cmd_netsync.cc	39a96b273f26950ce8701dd041994f5c0b254877
+++ cmd_netsync.cc	92bc91c7137e339e086b3ab761f1aed5df203143
@@ -367,8 +367,7 @@ CMD(clone, "clone", "", CMD_REF(network)
         % ident % app.opts.branchname);
     }
 
-  shared_ptr<roster_t> empty_roster = shared_ptr<roster_t>(new roster_t());
-  roster_t current_roster;
+  roster_t empty_roster, current_roster;
 
   L(FL("checking out revision %s to directory %s") % ident % workspace_dir);
   app.db.get_roster(ident, current_roster);
@@ -378,7 +377,7 @@ CMD(clone, "clone", "", CMD_REF(network)
   app.work.put_work_rev(workrev);
 
   cset checkout;
-  make_cset(*empty_roster, current_roster, checkout);
+  make_cset(empty_roster, current_roster, checkout);
 
   content_merge_checkout_adaptor wca(app);
 
============================================================
--- cmd_ws_commit.cc	ca4c6f38c8f27580b0a4ba2f142f76ba5c957cc9
+++ cmd_ws_commit.cc	e21e2bb8831ce7e62bc428cf32ae10931b5e73e8
@@ -649,8 +649,7 @@ CMD(checkout, "checkout", "co", CMD_REF(
 
   app.create_workspace(dir);
 
-  shared_ptr<roster_t> empty_roster = shared_ptr<roster_t>(new roster_t());
-  roster_t current_roster;
+  roster_t empty_roster, current_roster;
 
   L(FL("checking out revision %s to directory %s") % revid % dir);
   app.db.get_roster(revid, current_roster);
@@ -660,7 +659,7 @@ CMD(checkout, "checkout", "co", CMD_REF(
   app.work.put_work_rev(workrev);
 
   cset checkout;
-  make_cset(*empty_roster, current_roster, checkout);
+  make_cset(empty_roster, current_roster, checkout);
 
   content_merge_checkout_adaptor wca(app);
 
============================================================
--- merge.cc	da50821577d3818bdabac10a8ae77844b6774bda
+++ merge.cc	a4cdad82820a961f6a82c450bc620c5db2bd5eb9
@@ -167,10 +167,11 @@ resolve_merge_conflicts(roster_t const &
         {
           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,
+                             result, adaptor, user_merge);
         }
 
-      try_to_merge_files(app, left_roster, right_roster,
-                         result, adaptor, user_merge);
     }
 
   E(result.is_clean(),