# 
# 
# delete_file "manifest.cc"
# 
# delete_file "manifest.hh"
# 
# patch "Makefile.am"
#  from [0d093162fd7f70ec376849b8c0179818e2b20c79]
#    to [9c2eaa3f099a520567f7a9e89c9780c92a923707]
# 
# patch "legacy.cc"
#  from [bd227764e3736c41e9b135c9b644d5c40a10d21d]
#    to [dce9c303bbed541f73e8f8d82e6ac4c018d051bb]
# 
# patch "legacy.hh"
#  from [593a5212d29b6e5abb730c6fe7e20146cfec5385]
#    to [39ea5733f2dda2777ef15178f0ce4b3ab53ffec1]
# 
# patch "update.cc"
#  from [4146a913fb0f38f711d1add3546741bd096cf502]
#    to [4ef16214b35aa9f9b73a60f5e6d9f630cdc70e68]
# 
============================================================
--- Makefile.am	0d093162fd7f70ec376849b8c0179818e2b20c79
+++ Makefile.am	9c2eaa3f099a520567f7a9e89c9780c92a923707
@@ -14,7 +14,6 @@
          key_store.cc key_store.hh					\
          file_io.cc file_io.hh						\
          keys.cc keys.hh						\
-         manifest.cc manifest.hh					\
          packet.cc packet.hh						\
          sanity.cc sanity.hh						\
          vocab.cc vocab.hh vocab_terms.hh numeric_vocab.hh		\
============================================================
--- legacy.cc	bd227764e3736c41e9b135c9b644d5c40a10d21d
+++ legacy.cc	dce9c303bbed541f73e8f8d82e6ac4c018d051bb
@@ -74,9 +74,10 @@
 
 
   void 
-  read_manifest_map(data const & dat,
+  read_manifest_map(manifest_data const & mdat,
                     manifest_map & man)
   {
+    data const & dat = mdat.inner();
     std::string::size_type pos = 0;
     while (pos != dat().size())
       {
@@ -100,11 +101,4 @@
     return;
   }
   
-  void 
-  read_manifest_map(manifest_data const & dat,
-                    manifest_map & man)
-  {  
-    read_manifest_map(dat.inner(), man);
-  }
-  
 }
============================================================
--- legacy.hh	593a5212d29b6e5abb730c6fe7e20146cfec5385
+++ legacy.hh	39ea5733f2dda2777ef15178f0ce4b3ab53ffec1
@@ -41,10 +41,8 @@
   // parsing old-style manifests, for 'rosterify' and 'changesetify' commands
   typedef std::map<file_path, file_id, 
                    std::less<file_path> > manifest_map;
-  void read_manifest_map(data const & dat,
+  void read_manifest_map(manifest_data const & mdat,
                          manifest_map & man);
-  void read_manifest_map(manifest_data const & dat,
-                         manifest_map & man);
 
 }
 
============================================================
--- update.cc	4146a913fb0f38f711d1add3546741bd096cf502
+++ update.cc	4ef16214b35aa9f9b73a60f5e6d9f630cdc70e68
@@ -11,7 +11,6 @@
 
 #include "app_state.hh"
 #include "database.hh"
-#include "manifest.hh"
 #include "sanity.hh"
 #include "cert.hh"
 #include "transforms.hh"