# 
# 
# patch "ChangeLog"
#  from [ddd59ee787c58fd0a0992af9b73e6c2e0fd769ac]
#    to [0eee131ff7f8d9bde34045d15191c8f5cbee6443]
# 
# patch "packet.cc"
#  from [9667969d6ba25d0a899e35634c1a0dbe4ecda87c]
#    to [a0e13964d4ea07972b0b77e27aaa42ce5ae44852]
# 
# patch "packet.hh"
#  from [8fafc3cfc98a943ab838e3cb3ebb52543c66b244]
#    to [929d4d33d22c72aad18767a87fb6b191351ed799]
# 
============================================================
--- ChangeLog	ddd59ee787c58fd0a0992af9b73e6c2e0fd769ac
+++ ChangeLog	0eee131ff7f8d9bde34045d15191c8f5cbee6443
@@ -1,5 +1,9 @@
 2006-01-10  Nathaniel Smith  <address@hidden>
 
+	* packet.cc (consume_file_delta): Remove unused 4-argument form.
+
+2006-01-10  Nathaniel Smith  <address@hidden>
+
 	* lua.{cc,hh} (hook_resolve_file_conflict)
 	(hook_resolve_dir_conflict): Remove dead code.
 
============================================================
--- packet.cc	9667969d6ba25d0a899e35634c1a0dbe4ecda87c
+++ packet.cc	a0e13964d4ea07972b0b77e27aaa42ce5ae44852
@@ -81,15 +81,6 @@
                                      file_id const & new_id,
                                      file_delta const & del)
 {
-  consume_file_delta(old_id, new_id, del, false);
-}
-
-void 
-packet_db_writer::consume_file_delta(file_id const & old_id, 
-                                     file_id const & new_id,
-                                     file_delta const & del,
-                                     bool write_full)
-{
   transaction_guard guard(app.db);
 
   if (app.db.file_version_exists(new_id))
@@ -112,12 +103,7 @@
   patch(old_dat.inner(), del.inner(), new_dat);
   calculate_ident(file_data(new_dat), confirm);
   if (confirm == new_id)
-    {
-      if (!write_full)
-        app.db.put_file_version(old_id, new_id, del);
-      else
-        app.db.put_file(new_id, file_data(new_dat));
-    }
+    app.db.put_file_version(old_id, new_id, del);
   else
     {
       W(F("reconstructed file from delta '%s' -> '%s' has wrong id '%s'\n") 
============================================================
--- packet.hh	8fafc3cfc98a943ab838e3cb3ebb52543c66b244
+++ packet.hh	929d4d33d22c72aad18767a87fb6b191351ed799
@@ -108,10 +108,6 @@
   virtual void consume_file_delta(file_id const & id_old, 
                                   file_id const & id_new,
                                   file_delta const & del);
-  virtual void consume_file_delta(file_id const & id_old, 
-                                  file_id const & id_new,
-                                  file_delta const & del,
-                                  bool write_full);
   
   virtual void consume_revision_data(revision_id const & ident, 
                                      revision_data const & dat);