# 
# patch "ChangeLog"
#  from [fd5912c3bd02ef36db6f3fb68b513d1f3ef59bb6]
#    to [fefef0faedab00880604f3b71e7d4bfb4da24fa2]
# 
# patch "netsync.cc"
#  from [ae1621049348d574ecf3694807ba5e8dd167a34f]
#    to [00f4aeafa0fa361629ef0117793ba1e8a356331a]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,7 +1,11 @@
+2005-07-16  Nathaniel Smith  <address@hidden>
+
+	* ChangeLog: Fix formatting.
+
 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.
+	* 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
+++ netsync.cc
@@ -731,7 +731,12 @@
     {
     case cert_item:
       if (cert_in_ticker.get() != NULL)
-        ++(*cert_in_ticker);
+        {
+          ++(*cert_in_ticker);
+          hexenc<id> h;
+          encode_hexenc(ident, h);
+          L(F("ticked for cert %s") % h);
+        }
       break;
     case revision_item:
       if (revision_in_ticker.get() != NULL)
@@ -1176,20 +1181,27 @@
           {
             cert_value name;
             decode_base64(j->value, name);
+            hexenc<id> hash;
+            cert_hash_code(*j, hash);
             if (ok_branches.find(name()) != ok_branches.end())
-              keeping.push_back(*j);
+              {
+                L(F("kept branch cert '%s'") % hash);
+                keeping.push_back(*j);
+              }
             else if (bad_branches.find(name()) != bad_branches.end())
-              ;
+                L(F("discarded branch cert '%s'") % hash);
             else
               {
                 if (our_matcher(name()))
                   {
+                    L(F("kept branch cert '%s'") % hash);
                     ok_branches.insert(name());
                     keeping.push_back(*j);
                   }
                 else
                   {
                     bad_branches.insert(name());
+                    L(F("discarded branch cert '%s'") % hash);
                     W(F("Dropping branch certs for unwanted branch %s")
                       % name);
                   }
@@ -3701,10 +3713,18 @@
       revision_id const & ident = i->second.first;
       rsa_keypair_id const & key = i->second.second;
       
+      L(F("considering cert '%s'") % hash);
       if (revision_ids.find(ident) == revision_ids.end())
-        continue;
+        {
+          L(F("it's not on a good revision ('%s')")% ident.inner()());
+          continue;
+        }
       if (bad_branch_certs.find(hash) != bad_branch_certs.end())
-        continue;
+        {
+          L(F("it's a bad branch cert"));
+          continue;
+        }
+      L(F("including cert '%s'") % hash);
       
       id raw_hash;
       decode_hexenc(hash, raw_hash);