[Monotone-commits-diffs] Revision b4cac04bda6d865b9257fe986ecb63031938f659

[monotone]

-----------------------------------------------------------------
Revision: b4cac04bda6d865b9257fe986ecb63031938f659
Ancestor: c9877dd19f1ed50a5e3f814b31688534e74889f4
Ancestor: fcb9a0d361d1d3ca69633f457e726f33c9a413ff
Author: address@hidden
Date: 2005-04-18T14:44:27
Branch: net.venge.monotone.cvssync

Added files:
        CVS_prot cryptopp/md5.cpp cryptopp/md5.h cvs_client.cc
        cvs_client.hh cvs_repository.cc cvs_sync.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/README
        tests/t_add_stomp_file.at tests/t_add_vs_commit.at
        tests/t_cvsimport2.at tests/t_cvspull_combined.at
        tests/t_cvspull_committemplate.at
        tests/t_cvspull_samedirname.at tests/t_cvspull_separate.at
        tests/t_database_check_minor.at
        tests/t_db_kill_rev_locally.at tests/t_lf_crlf.at
        tests/t_override_author_date.at tests/t_rcs_import.at
        tests/t_rename_dir_add_dir_with_old_name.at
        tests/t_update_nonexistent.at
Modified files:
        .mt-attrs AUTHORS ChangeLog Makefile.am NEWS app_state.cc
        app_state.hh basic_io.cc cert.cc cert.hh change_set.cc
        commands.cc commands.hh constants.cc contrib/README
        contrib/monotone-notify.pl contrib/monotone.bash_completion
        contrib/monotone.el database.cc database.hh
        database_check.cc diff_patch.cc manifest.cc monotone.1
        monotone.cc monotone.texi netsync.cc packet.cc rcs_import.cc
        revision.cc sanity.cc sanity.hh smap.hh std_hooks.lua
        tests/t_database_check.at tests/t_diff_binary.at
        tests/t_netsync_defaults.at tests/t_netsync_single.at
        tests/t_no_rename_overwrite.at tests/t_vcheck.at
        testsuite.at transforms.cc transforms.hh ui.cc ui.hh
        vocab.hh vocab_terms.hh win32/process.cc win32/terminal.cc
        work.cc

ChangeLog: 

explicit_merge of c9877dd19f1ed50a5e3f814b31688534e74889f4
              and fcb9a0d361d1d3ca69633f457e726f33c9a413ff
   using ancestor e4675069c18a78f06a62a85c33d73e5562065f5d
        to branch 'net.venge.monotone.cvssync'


monotone --db={your.database} diff 
--revision=c9877dd19f1ed50a5e3f814b31688534e74889f4 
--revision=b4cac04bda6d865b9257fe986ecb63031938f659
monotone --db={your.database} diff 
--revision=fcb9a0d361d1d3ca69633f457e726f33c9a413ff 
--revision=b4cac04bda6d865b9257fe986ecb63031938f659
----------------------------------------------------------------------