# 
# 
# patch "ChangeLog"
#  from [2362b010fa9a1c0ac5c23b927b5a4b36ed9724c2]
#    to [e5e21ba2f2af6fd75881b1ea5a15aaccbb36491e]
# 
# patch "packet.cc"
#  from [06b93709b49bc581a5274afc7762f503abf89dc2]
#    to [fb8fa0a996f6e27a66a2c7c3c357a627f2d4ffd5]
# 
============================================================
--- ChangeLog	2362b010fa9a1c0ac5c23b927b5a4b36ed9724c2
+++ ChangeLog	e5e21ba2f2af6fd75881b1ea5a15aaccbb36491e
@@ -1,5 +1,10 @@
 2006-05-09  Derek Scherger  <address@hidden>
 
+	* packet.cc (consume_file_delta): remove redundant file delta
+	verification
+
+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
============================================================
--- packet.cc	06b93709b49bc581a5274afc7762f503abf89dc2
+++ packet.cc	fb8fa0a996f6e27a66a2c7c3c357a627f2d4ffd5
@@ -96,19 +96,7 @@
       return;
     }
 
-  file_id confirm;
-  file_data old_dat;
-  data new_dat;
-  app.db.get_file_version(old_id, old_dat);
-  patch(old_dat.inner(), del.inner(), new_dat);
-  calculate_ident(file_data(new_dat), confirm);
-  if (confirm == new_id)
-    app.db.put_file_version(old_id, new_id, del);
-  else
-    {
-      W(F("reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n") 
-        % old_id % new_id % confirm);
-    }
+  app.db.put_file_version(old_id, new_id, del);
 
   guard.commit();
 }
@@ -126,7 +114,7 @@
     }
 
   revision_set rev;
-      MM(rev);
+  MM(rev);
   read_revision_set(dat, rev);
       
   for (edge_map::const_iterator i = rev.edges.begin();