# 
# patch "ChangeLog"
#  from [65d797eb293a39c9e38d475760e682eadd527706]
#    to [14b789b0239c4006d5392dfb843c00826dc6d206]
# 
# patch "netsync.cc"
#  from [e1239ee221729406ac7a958d4f9f8740f774b127]
#    to [6ac44712dc4b51df54c5a0ab95bd0ee0211d26eb]
# 
# patch "tests/t_netsync_diffbranch.at"
#  from [a529b5b568039685d66db00c8550b817fbc3a4a4]
#    to [6a2a4e9b6dada24dea2ad88bd0c3d0caf8d180bc]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,10 @@
+2005-06-21  Nathaniel Smith  <address@hidden>
+
+	* netsync.cc (rebuild_merkle_trees): Fix FIXME comments to match
+	reality.
+	* tests/t_netsync_diffbranch.at: No longer a bug, remove
+	priority.
+
 2005-06-20  Nathaniel Smith  <address@hidden>
 
 	* monotone.texi (Hook Reference): Oops, missed a @ref.
--- netsync.cc
+++ netsync.cc
@@ -3612,21 +3612,6 @@
   ticker certs_ticker("certs", "c", 256);
   ticker keys_ticker("keys", "k", 1);
 
-  // this code is wrong.  the way the logic _should_ work is:
-  //   -- start with all branches we want to include
-  //   -- for each such branch, find all branch certs for that branch
-  //   -- for each such cert, note down its revision
-  //      (or these two steps can be replaced with anything else that gives us
-  //      list of all revisions in the branch)
-  //   -- expand this set of revisions to include all of their ancestors
-  //   -- for each such revision, insert all of its certs into the cert table,
-  //      and note all of its branches and keys
-  //   -- for each such branch, insert its epoch into the epoch table, and for
-  //      each such key, insert its key into the key table.
-  // this somewhat convoluted approach is necessary to handle cases where
-  // ancestors leave the branch inclusion set, where revisions carry branches
-  // that are otherwise outside of the inclusion set, etc.
-
   set<revision_id> revision_ids;
   set<rsa_keypair_id> inserted_keys;
 
@@ -3645,6 +3630,9 @@
           }
       }
     
+    // FIXME: we should probably include epochs for all branches mentioned in
+    // any included branch cert, rather than just for branches included by the
+    // branch mask
     {
       map<cert_value, epoch_data> epochs;
       app.db.get_epochs(epochs);
--- tests/t_netsync_diffbranch.at
+++ tests/t_netsync_diffbranch.at
@@ -1,4 +1,4 @@
-AT_SETUP([(normal) pull a netsync branch which has a parent from another branch])
+AT_SETUP([pull a netsync branch which has a parent from another branch])
 AT_KEYWORDS([netsync])