# 
# 
# patch "annotate.cc"
#  from [32acf2725e802a45aa5d9abdae1b19d1ce77a52f]
#    to [38c2d6394975e071ddc09d8349cc2a7001f88511]
# 
# patch "commands.cc"
#  from [c812764334b54ac79316d709f830017362668aea]
#    to [f211db01212c36e7fd85dccfbe3554d5d491f9dc]
# 
# patch "database.hh"
#  from [8f1965d29d5a74b5581740d69f6291bdd71def51]
#    to [6c79706beaa86a7a1af325616795514ee6d620aa]
# 
# patch "inodeprint.cc"
#  from [c96e97f83afb3dfad9cafaab8baf3595e7971698]
#    to [49cfddcee6a39755d3d2f8d6c2bc7fb49c5a556d]
# 
# patch "legacy.hh"
#  from [09d14a7e12c496b847a17a737074ef6f38cccf85]
#    to [3f55febed1c4c75bd0e23ce7ddd25210144ae43c]
# 
# patch "manifest.hh"
#  from [4104c7fda6af925c943515a923cf487f2af2dd24]
#    to [10bad403f789b8f76b985ea8d2a9cc70546e6714]
# 
# patch "monotone.texi"
#  from [29074acc0a74ff89f8b12d1e6467d9a3c9d59a32]
#    to [36cd4f467f885aa3b64eced4e17fc07cecdefc07]
# 
# patch "rcs_import.cc"
#  from [7fdbbf5d3a09d91236dacff66bba8344ac3e1c75]
#    to [9498b94192bc37771313b1daff2f88b564b4dc2c]
# 
# patch "restrictions.cc"
#  from [52cd3bcb4af1ff9dce3cdfa303b8170d231f89d3]
#    to [7cd8387ff7d2274e95fada7faf9e38e19dda9f04]
# 
# patch "update.hh"
#  from [f9af1d7dfba53ebb4ad2e6930bdc4e37fb5c4f36]
#    to [f2eabe7487e1b3b6892cc490575fe271d2c0e675]
# 
# patch "work.hh"
#  from [81add376cf6c2448fa5d48c117b6b472d02def69]
#    to [abc46f82b48bd3a9c31beb58446c3ef484880088]
# 
# patch "xdelta.hh"
#  from [1b06a9dce1174f9c40fd5e8541aa0c6d81f13d50]
#    to [4df1153df6a717ff6e733bc6c479a7486f9bc067]
# 
============================================================
--- annotate.cc	32acf2725e802a45aa5d9abdae1b19d1ce77a52f
+++ annotate.cc	38c2d6394975e071ddc09d8349cc2a7001f88511
@@ -16,7 +16,6 @@
 #include "cset.hh"
 #include "interner.hh"
 #include "lcs.hh"
-#include "manifest.hh"
 #include "platform.hh"
 #include "revision.hh"
 #include "sanity.hh"
============================================================
--- commands.cc	c812764334b54ac79316d709f830017362668aea
+++ commands.cc	f211db01212c36e7fd85dccfbe3554d5d491f9dc
@@ -28,7 +28,6 @@
 #include "diff_patch.hh"
 #include "file_io.hh"
 #include "keys.hh"
-#include "manifest.hh"
 #include "netsync.hh"
 #include "packet.hh"
 #include "rcs_import.hh"
@@ -3185,7 +3184,7 @@
   P(F("[merged] %s\n") % merged);
 }
 
-CMD(complete, N_("informative"), N_("(revision|manifest|file|key) PARTIAL-ID"),
+CMD(complete, N_("informative"), N_("(revision|file|key) PARTIAL-ID"),
     N_("complete partial id"),
     OPT_VERBOSE)
 {
@@ -3208,14 +3207,6 @@
           else cout << describe_revision(app, i->inner()) << endl;
         }
     }
-  else if (idx(args, 0)() == "manifest")
-    {      
-      set<manifest_id> completions;
-      app.db.complete(idx(args, 1)(), completions);
-      for (set<manifest_id>::const_iterator i = completions.begin();
-           i != completions.end(); ++i)
-        cout << i->inner()() << endl;
-    }
   else if (idx(args, 0)() == "file")
     {
       set<file_id> completions;
============================================================
--- database.hh	8f1965d29d5a74b5581740d69f6291bdd71def51
+++ database.hh	6c79706beaa86a7a1af325616795514ee6d620aa
@@ -19,7 +19,6 @@
 #include <string>
 
 #include "cset.hh"
-#include "manifest.hh"
 #include "numeric_vocab.hh"
 #include "paths.hh"
 #include "cleanup.hh"
@@ -266,9 +265,6 @@
   void get_manifest_version(manifest_id const & id,
                             manifest_data & dat);
 
-  void get_manifest(manifest_id const & id,
-                    manifest_map & mm);
-
   void get_revision_ancestry(std::multimap<revision_id, revision_id> & graph);
 
   void get_revision_parents(revision_id const & id,
@@ -433,9 +429,6 @@
                 std::set<revision_id> & completions);
 
   void complete(std::string const & partial,
-                std::set<manifest_id> & completions);
-  
-  void complete(std::string const & partial,
                 std::set<file_id> & completions);
 
   void complete(std::string const & partial,
============================================================
--- inodeprint.cc	c96e97f83afb3dfad9cafaab8baf3595e7971698
+++ inodeprint.cc	49cfddcee6a39755d3d2f8d6c2bc7fb49c5a556d
@@ -12,14 +12,13 @@
 #include <iterator>
 
 #include "app_state.hh"
-#include "manifest.hh"
 #include "inodeprint.hh"
 #include "sanity.hh"
 #include "platform.hh"
 #include "constants.hh"
 
 // this file defines the inodeprint_map structure, and some operations on it.
-// it is currently heavily based on manifest.cc.
+// it is currently heavily based on the old manifest.cc.
 
 // reading inodeprint_maps
 
============================================================
--- legacy.hh	09d14a7e12c496b847a17a737074ef6f38cccf85
+++ legacy.hh	3f55febed1c4c75bd0e23ce7ddd25210144ae43c
@@ -15,11 +15,16 @@
 
 namespace legacy
 {
+  ////////
+  // parser for old .mt-attrs file format
   typedef std::map<file_path, std::map<std::string, std::string> > dot_mt_attrs_map;
 
   void 
   read_dot_mt_attrs(data const & dat, dot_mt_attrs_map & attr);
 
+  ///////
+  // parsing old-style revisions, for 'rosterify' command
+
   // HACK: this is a special reader which picks out the new_manifest field in
   // a revision; it ignores all other symbols. This is because, in the
   // pre-roster database, we have revisions holding change_sets, not
@@ -31,6 +36,14 @@
   get_manifest_for_rev(app_state & app,
                        revision_id const & ident,
                        manifest_id & mid);
+
+  ///////
+  // parsing old-style manifests, for 'rosterify' and 'changesetify' commands
+  typedef std::pair<file_path const, file_id> manifest_entry;
+  typedef std::map<file_path, file_id, 
+                   std::less<file_path>, 
+                   QA(manifest_entry) > manifest_map;
+
 }
 
 #endif
============================================================
--- manifest.hh	4104c7fda6af925c943515a923cf487f2af2dd24
+++ manifest.hh	10bad403f789b8f76b985ea8d2a9cc70546e6714
@@ -69,22 +69,10 @@
   return i->second;
 }
 
-std::ostream & operator<<(std::ostream & out, manifest_entry const & e);
-
-class app_state;
-
 void read_manifest_map(data const & dat,
                        manifest_map & man);
 
 void read_manifest_map(manifest_data const & dat,
                        manifest_map & man);
 
-void write_manifest_map(manifest_map const & man, 
-                        manifest_data & dat);
-
-void write_manifest_map(manifest_map const & man, 
-                        data & dat);
-
-void dump(manifest_map const & man, std::string & out);
-
 #endif // __MANIFEST_HH__
============================================================
--- monotone.texi	29074acc0a74ff89f8b12d1e6467d9a3c9d59a32
+++ monotone.texi	36cd4f467f885aa3b64eced4e17fc07cecdefc07
@@ -3922,7 +3922,6 @@
 
 @item monotone complete file @var{partial-id}
 @itemx monotone complete [--brief] key @var{partial-id}
address@hidden monotone complete manifest @var{partial-id}
 @itemx monotone complete [--brief] revision @var{partial-id}
 
 These commands print out all known completions of a partial @sc{sha1}
@@ -3932,14 +3931,14 @@
 
 @smallexample
 @group
-$ monotone complete manifest fa36
+$ monotone complete revision fa36
 fa36deead87811b0e15208da2853c39d2f6ebe90
 fa36b76dd0139177b28b379fe1d56b22342e5306
 fa36965ec190bee14c5afcac235f1b8e2239bb2a
 @end group
 @end smallexample
 
-Then monotone is telling you that there are 3 manifests it knows
+Then monotone is telling you that there are 3 revisions it knows
 about, in its database, which begin with the 4 hex digits
 @code{fa36}. This command is intended to be used by programmable
 completion systems, such as those in @command{bash} and @command{zsh}.
============================================================
--- rcs_import.cc	7fdbbf5d3a09d91236dacff66bba8344ac3e1c75
+++ rcs_import.cc	9498b94192bc37771313b1daff2f88b564b4dc2c
@@ -31,7 +31,6 @@
 #include "file_io.hh"
 #include "interner.hh"
 #include "keys.hh"
-#include "manifest.hh"
 #include "packet.hh"
 #include "paths.hh"
 #include "platform.hh"
============================================================
--- restrictions.cc	52cd3bcb4af1ff9dce3cdfa303b8170d231f89d3
+++ restrictions.cc	7cd8387ff7d2274e95fada7faf9e38e19dda9f04
@@ -7,7 +7,6 @@
 #include <string>
 #include <vector>
 
-#include "manifest.hh"
 #include "restrictions.hh"
 #include "revision.hh"
 #include "safe_map.hh"
============================================================
--- update.hh	f9af1d7dfba53ebb4ad2e6930bdc4e37fb5c4f36
+++ update.hh	f2eabe7487e1b3b6892cc490575fe271d2c0e675
@@ -9,7 +9,6 @@
 #include <set>
 
 #include "app_state.hh"
-#include "manifest.hh"
 #include "vocab.hh"
 
 // this function just encapsulates the (somewhat complex) logic 
============================================================
--- work.hh	81add376cf6c2448fa5d48c117b6b472d02def69
+++ work.hh	abc46f82b48bd3a9c31beb58446c3ef484880088
@@ -12,7 +12,6 @@
 #include <map>
 
 #include "cset.hh"
-#include "manifest.hh"
 #include "paths.hh"
 #include "roster.hh"
 #include "vocab.hh"
============================================================
--- xdelta.hh	1b06a9dce1174f9c40fd5e8541aa0c6d81f13d50
+++ xdelta.hh	4df1153df6a717ff6e733bc6c479a7486f9bc067
@@ -9,8 +9,6 @@
 #include <string>
 #include <boost/shared_ptr.hpp>
 
-#include "manifest.hh"
-
 void 
 compute_delta(std::string const & a,
               std::string const & b,