# 
# patch "ChangeLog"
#  from [b4219c4cf62366ed101b1df381be7166694492d4]
#    to [2f8a077a04ccfde37f8ef5c055d69179e58d0d09]
# 
# patch "netsync.cc"
#  from [1180cf1533122b6407211696ce4865ba93cded96]
#    to [ae1621049348d574ecf3694807ba5e8dd167a34f]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,8 @@
+2005-07-15  Matt Johnston  <address@hidden>
+
+  * netsync.cc (rebuild_merkle_trees): bad_branch_certs is a set of cert
+  hashes, not of revision idents.
+
 2005-07-14  Nathaniel Smith  <address@hidden>
 
 	* netsync.cc (process_delta_cmd): Remove meaningless comment.
--- netsync.cc
+++ netsync.cc
@@ -3633,6 +3633,7 @@
   set<revision_id> revision_ids;
   set<rsa_keypair_id> inserted_keys;
   
+  // bad_branch_certs is a set of cert hashes.
   set< hexenc<id> > bad_branch_certs;
   {
     // get all matching branch names
@@ -3648,7 +3649,11 @@
                                 revision_ids, app);
           }
         else
-          bad_branch_certs.insert(idx(certs, i).inner().ident);
+          {
+            hexenc<id> hash;
+            cert_hash_code(idx(certs, i).inner(), hash);
+            bad_branch_certs.insert(hash);
+          }
       }
   }