[Monotone-commits-diffs] Revision 967ef7ddaabbb956506fde04bc2a62d449d5db56

[monotone]

-----------------------------------------------------------------
Revision: 967ef7ddaabbb956506fde04bc2a62d449d5db56
Ancestor: 07e3c64db31734efc2a3ca94d8f4dbd9c51c0e43
Ancestor: 68fe12e6f1de7d161eb9e27dd757e7d230049520
Author: address@hidden
Date: 2005-04-29T12:34:40
Branch: net.venge.monotone.cvssync

Added files:
        CVS_prot annotate.cc annotate.hh cryptopp/md5.cpp
        cryptopp/md5.h cvs_client.cc cvs_client.hh cvs_repository.cc
        cvs_sync.hh selectors.cc selectors.hh tests.cvs/cleanup
        tests.cvs/cvs_test_setup tests.cvs/cvs_test_setup2
        tests.cvs/cvs_test_setup3 tests.cvs/cvs_test_setup4
        tests.cvs/cvs_test_setup5 tests.cvs/db_setup
        tests.cvs/db_setup2 tests.cvs/show_disk_usage
        tests.cvs/test_all tests/t_annotate.at
        tests/t_annotate_add_collision.at
        tests/t_annotate_branch_collision.at
        tests/t_automate_graph.at tests/t_automate_select.at
        tests/t_cvsimport_manifest_cycle.at
        tests/t_cvspull_combined.at
        tests/t_cvspull_committemplate.at
        tests/t_cvspull_samedirname.at tests/t_cvspull_separate.at
        tests/t_i18n_file_data.at tests/t_merge_6.at
        tests/t_netsync_error.at tests/t_parents_children.at
        tests/t_select_cert.at tests/t_update_inodeprints.at
Modified files:
        AUTHORS ChangeLog Makefile.am NEWS app_state.cc app_state.hh
        automate.cc change_set.cc commands.cc commands.hh
        database.cc database.hh diff_patch.cc inodeprint.cc lcs.cc
        lcs.hh lua.cc manifest.cc manifest.hh monotone.1 monotone.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 quick_alloc.hh
        rcs_import.cc revision.cc revision.hh sanity.hh
        sqlite/alter.c sqlite/btree.c sqlite/btree.h sqlite/build.c
        sqlite/date.c sqlite/expr.c sqlite/insert.c
        sqlite/keywordhash.h sqlite/main.c sqlite/opcodes.h
        sqlite/os_unix.c sqlite/os_win.c sqlite/pager.c
        sqlite/pager.h sqlite/parse.c sqlite/parse.h sqlite/pragma.c
        sqlite/select.c sqlite/sqlite3.h sqlite/sqliteInt.h
        sqlite/trigger.c sqlite/util.c sqlite/vdbe.c sqlite/vdbe.h
        sqlite/vdbeInt.h sqlite/vdbeaux.c std_hooks.lua
        tests/t_automate_ancestors.at tests/t_cvsimport2.at
        tests/t_i18n_file.at tests/t_inventory.at
        tests/t_rename_attr.at testsuite.at transforms.cc
        transforms.hh ui.cc ui.hh vocab.cc win32/inodeprint.cc
        work.cc work.hh

ChangeLog: 

explicit_merge of 68fe12e6f1de7d161eb9e27dd757e7d230049520
              and 07e3c64db31734efc2a3ca94d8f4dbd9c51c0e43
   using ancestor bdd9f873a879a1bb05d777ab309b4af7589c0352
        to branch 'net.venge.monotone.cvssync'


monotone --db={your.database} diff 
--revision=07e3c64db31734efc2a3ca94d8f4dbd9c51c0e43 
--revision=967ef7ddaabbb956506fde04bc2a62d449d5db56
monotone --db={your.database} diff 
--revision=68fe12e6f1de7d161eb9e27dd757e7d230049520 
--revision=967ef7ddaabbb956506fde04bc2a62d449d5db56
----------------------------------------------------------------------