# 
# patch "ChangeLog"
#  from [8c3e27d738316891c3d4dda44fe65b89edc2c149]
#    to [10d572569e4bba22882e4c3a842ae90e541e13dc]
# 
# patch "netsync.cc"
#  from [5fb2f9133fde0774f81d181e4450a57f5403d4e7]
#    to [13924a9ed3cf3ee5329ac4607c7b8508a39ed488]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,9 @@
 2005-05-03  Nathaniel Smith  <address@hidden>
 
+	* netsync.cc (load_epoch): Remove unused function.
+
+2005-05-03  Nathaniel Smith  <address@hidden>
+
 	* UPGRADE: Fix version number.
 
 2005-05-03  Nathaniel Smith  <address@hidden>
--- netsync.cc
+++ netsync.cc
@@ -376,8 +376,6 @@
   void rebuild_merkle_trees(app_state & app,
                             utf8 const & collection);
 
-  void load_epoch(cert_value const & branchname, epoch_id const & epoch);
-  
   bool dispatch_payload(netcmd const & cmd);
   void begin_service();
   bool process();
@@ -3275,24 +3273,6 @@
   return tab;
 }
 
-
-// BROKEN
-void
-session::load_epoch(cert_value const & branchname, epoch_id const & epoch)
-{
-  // hash is of concat(branch name, raw epoch id).  This is unique, because
-  // the latter has a fixed length.
-  std::string tmp(branchname());
-  id raw_epoch;
-  decode_hexenc(epoch.inner(), raw_epoch);
-  tmp += raw_epoch();
-  data tdat(tmp);
-  hexenc<id> out;
-  calculate_ident(tdat, out);
-  id raw_hash;
-  decode_hexenc(out, raw_hash);
-}
-
 void 
 session::rebuild_merkle_trees(app_state & app,
                               utf8 const & collection)