# 
# 
# patch "commands.cc"
#  from [842e3085a1ea0d50bfbc56e6354800da6e602066]
#    to [97aed6eac0ce5d36656479a506aa6a1193f63aef]
# 
# patch "revision.cc"
#  from [ef14e9d3b521f5a73f2ea33a3e1e6168f477bc5d]
#    to [15f73585c4aec4239f08b930f9e685c8d36204c4]
# 
============================================================
--- commands.cc	842e3085a1ea0d50bfbc56e6354800da6e602066
+++ commands.cc	97aed6eac0ce5d36656479a506aa6a1193f63aef
@@ -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"
@@ -1931,7 +1930,7 @@
   size_t count = 0;
   if (args.empty())
     {
-      count += read_packets(cin, dbw);
+      count += read_packets(cin, dbw, app);
       N(count != 0, F("no packets found on stdin"));
     }
   else
@@ -1941,7 +1940,7 @@
           data dat;
           read_data(system_path(*i), dat);
           istringstream ss(dat());
-          count += read_packets(ss, dbw);
+          count += read_packets(ss, dbw, app);
         }
       N(count != 0, FP("no packets found in given file",
                        "no packets found in given files",
@@ -3231,7 +3230,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)
 {
@@ -3254,14 +3253,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;
============================================================
--- revision.cc	ef14e9d3b521f5a73f2ea33a3e1e6168f477bc5d
+++ revision.cc	15f73585c4aec4239f08b930f9e685c8d36204c4
@@ -551,9 +551,6 @@
 // Stuff related to rebuilding the revision graph. Unfortunately this is a
 // real enough error case that we need support code for it.
 
-// Stuff related to rebuilding the revision graph. Unfortunately this is a
-// real enough error case that we need support code for it.
-
 typedef std::map<u64, 
                  std::pair<boost::shared_ptr<roster_t>, 
                            boost::shared_ptr<marking_map>