[Monotone-commits-diffs] Revision c7708538891d82dc3a476fdda83f245633853f2f

[monotone]

-----------------------------------------------------------------
Revision: c7708538891d82dc3a476fdda83f245633853f2f
Ancestor: 16a3861d1597a3015b0855f849378aad314de972
Ancestor: 30d8ac7990c653fd0df37550f50e90b5ed9de72d
Author: address@hidden
Date: 2005-04-29T01:11:14
Branch: net.venge.monotone

Added files:
        annotate.cc annotate.hh tests/t_annotate.at
        tests/t_annotate_add_collision.at
        tests/t_annotate_branch_collision.at tests/t_merge_6.at
Modified files:
        ChangeLog Makefile.am commands.cc monotone.texi netsync.cc
        netxx/address.cxx netxx/datagram.cxx
        netxx/resolve_getaddrinfo.cxx
        netxx/resolve_gethostbyname.cxx netxx/serverbase.cxx
        netxx/streambase.cxx netxx/types.h
        tests/t_automate_select.at tests/t_i18n_file.at
        tests/t_inventory.at testsuite.at transforms.cc

ChangeLog: 

merge of 16a3861d1597a3015b0855f849378aad314de972
     and 30d8ac7990c653fd0df37550f50e90b5ed9de72d


monotone --db={your.database} diff 
--revision=16a3861d1597a3015b0855f849378aad314de972 
--revision=c7708538891d82dc3a476fdda83f245633853f2f
monotone --db={your.database} diff 
--revision=30d8ac7990c653fd0df37550f50e90b5ed9de72d 
--revision=c7708538891d82dc3a476fdda83f245633853f2f
----------------------------------------------------------------------