# 
# patch "ChangeLog"
#  from [fefef0faedab00880604f3b71e7d4bfb4da24fa2]
#    to [4bfc7aa2da954cb72f968520af66b8b4a64bd5f7]
# 
# patch "netsync.cc"
#  from [00f4aeafa0fa361629ef0117793ba1e8a356331a]
#    to [ae1621049348d574ecf3694807ba5e8dd167a34f]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,9 @@
 2005-07-16  Nathaniel Smith  <address@hidden>
 
+	* netsync.cc: Revert accidentally committed changes.
+
+2005-07-16  Nathaniel Smith  <address@hidden>
+
 	* ChangeLog: Fix formatting.
 
 2005-07-15  Matt Johnston  <address@hidden>
--- netsync.cc
+++ netsync.cc
@@ -731,12 +731,7 @@
     {
     case cert_item:
       if (cert_in_ticker.get() != NULL)
-        {
-          ++(*cert_in_ticker);
-          hexenc<id> h;
-          encode_hexenc(ident, h);
-          L(F("ticked for cert %s") % h);
-        }
+        ++(*cert_in_ticker);
       break;
     case revision_item:
       if (revision_in_ticker.get() != NULL)
@@ -1181,27 +1176,20 @@
           {
             cert_value name;
             decode_base64(j->value, name);
-            hexenc<id> hash;
-            cert_hash_code(*j, hash);
             if (ok_branches.find(name()) != ok_branches.end())
-              {
-                L(F("kept branch cert '%s'") % hash);
-                keeping.push_back(*j);
-              }
+              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);
                   }
@@ -3713,18 +3701,10 @@
       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())
-        {
-          L(F("it's not on a good revision ('%s')")% ident.inner()());
-          continue;
-        }
+        continue;
       if (bad_branch_certs.find(hash) != bad_branch_certs.end())
-        {
-          L(F("it's a bad branch cert"));
-          continue;
-        }
-      L(F("including cert '%s'") % hash);
+        continue;
       
       id raw_hash;
       decode_hexenc(hash, raw_hash);