# 
# 
# patch "ChangeLog"
#  from [3b0faf979ea7bb1aee21366128eb7f77cbb29f58]
#    to [2362b010fa9a1c0ac5c23b927b5a4b36ed9724c2]
# 
# patch "automate.cc"
#  from [c46b8eb5ad814e12e1023132a7d85199d2d254f0]
#    to [9248451312ddd082473819116fee83d3fa9e0082]
# 
# patch "cmd_diff_log.cc"
#  from [baf27ecebe018cb3fc78b0a313eb5429b6cff101]
#    to [2a0dcbc23af9406c0b97177f5e93d114a09d5c54]
# 
# patch "commands.cc"
#  from [766ec7954924f1dd0eef55b8b2815f9c43688e6f]
#    to [bea3a3a5f0a708cd23c58ba9f7974fff9e3622ec]
# 
# patch "netsync.cc"
#  from [12a4896a3232dc7d020a90ed3a9857179741e739]
#    to [2fd9d1b3cbfb5500b18c8cae82f88a96cb9c50b8]
# 
============================================================
--- ChangeLog	3b0faf979ea7bb1aee21366128eb7f77cbb29f58
+++ ChangeLog	2362b010fa9a1c0ac5c23b927b5a4b36ed9724c2
@@ -1,3 +1,12 @@
+2006-05-09  Derek Scherger  <address@hidden>
+
+	* automate.cc (automate_inventory): remove invalid assertion
+	* cmd_diff_log.cc (log): check for null revision id rather than
+	missing revision id
+	* commands.cc: remove unnecessary #include 
+	(help): fix indentation
+	* netsync.cc: remove stale comment
+
 2006-05-07  Graydon Hoare  <address@hidden>
 
 	* database.{cc,hh} (pending_writes): New fulltext write buffer,
============================================================
--- automate.cc	c46b8eb5ad814e12e1023132a7d85199d2d254f0
+++ automate.cc	9248451312ddd082473819116fee83d3fa9e0082
@@ -690,8 +690,6 @@
   get_base_and_current_roster_shape(base, curr, nis, app);
   make_cset(base, curr, cs);
 
-  I(cs.deltas_applied.empty());
-
   // the current roster (curr) has the complete set of registered nodes
   // conveniently with unchanged sha1 hash values
 
============================================================
--- cmd_diff_log.cc	baf27ecebe018cb3fc78b0a313eb5429b6cff101
+++ cmd_diff_log.cc	2a0dcbc23af9406c0b97177f5e93d114a09d5c54
@@ -543,7 +543,6 @@
         app.db.get_roster(first_rid, new_roster);          
 
       // FIXME_RESTRICTIONS: should this add paths from the rosters of all selected revs?
-      // try log dir/ to see what happens
       mask = restriction(args, app.exclude_patterns, old_roster, new_roster, app);
     }
 
@@ -578,13 +577,7 @@
           set<  revision<id> > parents;
           vector< revision<cert> > tmp;
 
-          if (!app.db.revision_exists(rid))
-            {
-              L(FL("revision %s does not exist in db, skipping\n") % rid);
-              continue;
-            }
-
-          if (seen.find(rid) != seen.end())
+          if (null_id(rid) || seen.find(rid) != seen.end())
             continue;
 
           seen.insert(rid);
============================================================
--- commands.cc	766ec7954924f1dd0eef55b8b2815f9c43688e6f
+++ commands.cc	bea3a3a5f0a708cd23c58ba9f7974fff9e3622ec
@@ -8,7 +8,6 @@
 #include <map>
 #include <algorithm>
 
-#include "restrictions.hh"
 #include "transforms.hh"
 #include "inodeprint.hh"
 
@@ -229,14 +228,14 @@
 
 CMD(help, N_("informative"), N_("command [ARGS...]"), N_("display command help"), OPT_NONE)
 {
-        if (args.size() < 1)
-                throw usage("");
-
-        string full_cmd = complete_command(idx(args, 0)());
-        if ((*cmds).find(full_cmd) == (*cmds).end())
-                throw usage("");
-
-        throw usage(full_cmd);
+  if (args.size() < 1)
+    throw usage("");
+  
+  string full_cmd = complete_command(idx(args, 0)());
+  if ((*cmds).find(full_cmd) == (*cmds).end())
+    throw usage("");
+  
+  throw usage(full_cmd);
 }
 
 using std::set;
============================================================
--- netsync.cc	12a4896a3232dc7d020a90ed3a9857179741e739
+++ netsync.cc	2fd9d1b3cbfb5500b18c8cae82f88a96cb9c50b8
@@ -69,8 +69,6 @@
 //      its merkle trie.
 //   -- add some sort of vhost field to the client's first packet, saying who
 //      they expect to talk to
-//   -- apparently we have a IANA approved port: 4691.  I guess we should
-//      switch to using that.
 
 //
 // This is the "new" network synchronization (netsync) system in