# 
# 
# patch "legacy.hh"
#  from [4171983436b8f7b753d542a41c8d79567aaa12fe]
#    to [0c4af4b4b35d910b0985c19e033cd7bf9c92d4be]
# 
# patch "revision.cc"
#  from [fb281177ee3eea533fb50d414eb16270bc0b96eb]
#    to [5bc685b6800c97ed9e75b7a0c0e1a30bbc82ad22]
# 
============================================================
--- legacy.hh	4171983436b8f7b753d542a41c8d79567aaa12fe
+++ legacy.hh	0c4af4b4b35d910b0985c19e033cd7bf9c92d4be
@@ -35,10 +35,10 @@
   typedef std::map<revision_id, std::map<split_path, split_path> > renames_map;
 
   void 
-  get_manifest_for_rev(app_state & app,
-                       revision_id const & ident,
-                       manifest_id & mid,
-                       renames_map & renames);
+  get_manifest_and_renames_for_rev(app_state & app,
+                                   revision_id const & ident,
+                                   manifest_id & mid,
+                                   renames_map & renames);
 
   ///////
   // parsing old-style manifests, for 'rosterify' and 'changesetify' commands
============================================================
--- revision.cc	fb281177ee3eea533fb50d414eb16270bc0b96eb
+++ revision.cc	5bc685b6800c97ed9e75b7a0c0e1a30bbc82ad22
@@ -596,6 +596,8 @@
   std::map<u64,revision_id> node_to_new_rev;
   std::map<revision_id,u64> new_rev_to_node;
 
+  std::map<u64, legacy::renames_map> node_to_renames;
+
   std::multimap<u64, std::pair<cert_name, cert_value> > certs;
   std::multimap<u64, u64> ancestry;
   std::set<std::string> branches;
@@ -614,7 +616,8 @@
                                                  file_id const & fid,
                                                  parent_roster_map const & parent_rosters,
                                                  temp_node_id_source & nis,
-                                                 roster_t & child_roster);
+                                                 roster_t & child_roster,
+                                                 legacy::renames_map const & renames);
 };
 
 
@@ -819,12 +822,13 @@
       
       manifest_id man;
       legacy::renames_map renames;
-      legacy::get_manifest_for_rev(app, rev, man, renames);
+      legacy::get_manifest_and_renames_for_rev(app, rev, man, renames);
       
       L(F("node %d = revision %s = manifest %s\n") % node % rev % man);
       old_rev_to_node.insert(std::make_pair(rev, node));
       node_to_old_rev.insert(std::make_pair(node, rev));
       node_to_old_man.insert(std::make_pair(node, man));
+      node_to_renames.insert(std::make_pair(node, renames));
 
       // load certs
       std::vector< revision<cert> > rcerts;
@@ -923,7 +927,8 @@
                                                      file_id const & fid,
                                                      parent_roster_map const & parent_rosters,
                                                      temp_node_id_source & nis,
-                                                     roster_t & child_roster)
+                                                     roster_t & child_roster,
+                                                     legacy::renames_map const & renames)
 {
 
   split_path sp, dirname;
@@ -955,7 +960,8 @@
                                                     file_id(),
                                                     parent_rosters,
                                                     nis,
-                                                    child_roster);
+                                                    child_roster,
+                                                    renames);
       }
   }
 
@@ -1155,7 +1161,8 @@
               if (!(i->first == attr_path))
                 insert_into_roster_reusing_parent_entries(i->first, true, i->second,
                                                           parent_rosters,
-                                                          nis, child_roster);
+                                                          nis, child_roster,
+                                                          node_to_renames[child]);
             }
           
           // migrate attributes out of .mt-attrs