[Monotone-commits-diffs] Revision 609ea548a9a40acabbb1cf4e522ab3365b2daaf2

[monotone]

-----------------------------------------------------------------
Revision: 609ea548a9a40acabbb1cf4e522ab3365b2daaf2
Ancestor: 39bad4c70cc534c4cc2eaee69916931d4ba81db7
Author: address@hidden
Date: 2008-04-06T05:30:44
Branch: net.venge.monotone.nuskool

Modified files:
        Makefile.am cmd_netsync.cc gsync.cc gsync.hh http_client.cc
        http_client.hh net_common.cc net_common.hh netsync.cc
        vocab_terms.hh

ChangeLog: 

        Merge fixups and updates for new netsync_connection_info struct.

        This seems to work on initial pull to an empty database but if the
        pull is interrupted subsequent pulls do not properly determine all
        missing/inbound revisions. The problem may be with the changes to
        include/exclude patterns or it may be elsewhere.

        * Makefile.am: add files lost in merge
        * cmd_netsync.cc (gsync): adapt to new netsync_connection_info
        struct
        * gsync.{cc,hh} (run_gsync_protocol): remove unused
        include/exclude patterns
        * http_client.{cc,hh} (http_client::http_client,
        http_client::transact_json): replace uri and patterns with
        netsync_connection_info
        * net_common.{cc,hh} (build_stream_to_server): replace with copy
        from netsync.cc on mainline
        * netsync.cc (build_stream_to_server): remove from here
        (call_server, serve_connections): replace uri and patterns with
        netsync_connection_info
        * vocab_terms.hh: instantiate base64<delta> lost during merge

txt9dHNxMKmRs.txt
Description: Diff [39bad4c70cc534c4cc2eaee69916931d4ba81db7] -> [609ea548a9a40acabbb1cf4e522ab3365b2daaf2]