[Monotone-commits-diffs] Revision 6b72e940a0c1f3e9d79a60164964786aaea74798

[monotone]

-----------------------------------------------------------------
Revision: 6b72e940a0c1f3e9d79a60164964786aaea74798
Ancestor: 6bf957150bcf235c15c77693db96cd008e118441
Ancestor: ad4a6c241c55c7a69ae1b3dd444107ad12223d2e
Author: address@hidden
Date: 2005-04-29T06:32:24
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 manifest.cc manifest.hh
        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 revision.cc revision.hh
        tests/t_automate_select.at tests/t_i18n_file.at
        tests/t_inventory.at tests/t_rename_attr.at testsuite.at
        transforms.cc work.cc work.hh

ChangeLog: 

merge of 6bf957150bcf235c15c77693db96cd008e118441
     and ad4a6c241c55c7a69ae1b3dd444107ad12223d2e


monotone --db={your.database} diff 
--revision=6bf957150bcf235c15c77693db96cd008e118441 
--revision=6b72e940a0c1f3e9d79a60164964786aaea74798
monotone --db={your.database} diff 
--revision=ad4a6c241c55c7a69ae1b3dd444107ad12223d2e 
--revision=6b72e940a0c1f3e9d79a60164964786aaea74798
----------------------------------------------------------------------