# 
# 
# patch "ChangeLog"
#  from [043d49afb8de5c7fcd22b3d5a6048011cbae4c90]
#    to [73199c6255a7f3aed099c416c59da2411417b553]
# 
# patch "cmd_merging.cc"
#  from [51bd11871c38e866f6107a37f966de69d5ef1d46]
#    to [d9298d47c0e66143090540e8afde11ca3d96c7cb]
# 
============================================================
--- ChangeLog	043d49afb8de5c7fcd22b3d5a6048011cbae4c90
+++ ChangeLog	73199c6255a7f3aed099c416c59da2411417b553
@@ -1,5 +1,7 @@ 2007-02-09  Zack Weinberg  <address@hidden
 2007-02-09  Zack Weinberg  <address@hidden>
 
+	* cmd_merging.cc (merge_into_workspace): Use get_content_paths.
+
 	* work.cc (get_revision_id, get_base_revision, get_base_roster)
 	(get_base_and_current_roster_shape): Delete delete delete.
 	* work.hh: Likewise.  Improve comments.
@@ -298,7 +300,7 @@ 2007-02-09  Markus Schiltknecht  <markus
 
 	* tests/test_a_merge_8/{parent,left,right,correct}: simplified
 	the test case.
-	
+
 2007-02-08  Derek Scherger  <address@hidden>
 
 	* cmd_merging.cc (get_content_paths): new function
@@ -315,7 +317,7 @@ 2007-02-08  Derek Scherger  <address@hidden
 	(editable_working_tree::create_file_node): write file content here
 	rather than deferring it to attach_node
 	(editable_working_tree::attach_node): remove deferred file content
-	(editable_working_tree::apply_delta): remove path argument from 
+	(editable_working_tree::apply_delta): remove path argument from
 	get_version call
 
 2007-02-08  Zack Weinberg  <address@hidden>
============================================================
--- cmd_merging.cc	51bd11871c38e866f6107a37f966de69d5ef1d46
+++ cmd_merging.cc	d9298d47c0e66143090540e8afde11ca3d96c7cb
@@ -625,6 +625,7 @@ CMD(merge_into_workspace, N_("tree"),
 {
   revision_id left_id, right_id;
   database::cached_roster left, right;
+  roster_t working_roster;
 
   if (args.size() != 1)
     throw usage(name);
@@ -642,7 +643,6 @@ CMD(merge_into_workspace, N_("tree"),
       F("this command can only be used in a single-parent workspace"));
 
     temp_node_id_source nis;
-    roster_t working_roster;
     app.work.get_current_roster_shape(working_roster, nis);
     app.work.update_current_roster_from_filesystem(working_roster);
 
@@ -673,7 +673,10 @@ CMD(merge_into_workspace, N_("tree"),
   find_common_ancestor_for_merge(left_id, right_id, lca_id, app);
   app.db.get_roster(lca_id, lca);
 
-  content_merge_workspace_adaptor wca(app, lca.first);
+  map<file_id, file_path> paths;
+  get_content_paths(working_roster, paths);
+
+  content_merge_workspace_adaptor wca(app, lca.first, paths);
   resolve_merge_conflicts(*left.first, *right.first, merge_result, wca, app);
 
   // Make sure it worked...