[Monotone-commits-diffs] Revision 4650fb7cb2230e5b5a47164fe082e1394f19066b

[monotone]

-----------------------------------------------------------------
Revision: 4650fb7cb2230e5b5a47164fe082e1394f19066b
Ancestor: 616ec315888dd5b791999730cf6dcece1f4a3820
Ancestor: e95be13d506eb955b465a30fe7ce192354018384
Author: address@hidden
Date: 2005-08-25T08:51:48
Branch: net.venge.monotone.cvssync

Added files:
        CVS_prot crypto_tests.cc 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/t_ambiguous_tags.at tests/t_cvspull_combined.at
        tests/t_cvspull_committemplate.at
        tests/t_cvspull_samedirname.at tests/t_cvspull_separate.at
        tests/t_kill_tag_locally.at tests/t_merge_binary.at
        tests/t_netsync_exclude.at
        tests/t_netsync_exclude_default.at
        tests/t_netsync_read_permissions.at
        tests/t_restricted_diff_unchanged.at tests/t_set_default.at
Modified files:
        AUTHORS ChangeLog Makefile.am app_state.cc app_state.hh
        commands.cc configure.ac constants.cc constants.hh
        contrib/ciabot_monotone.py database.cc database.hh
        debian/changelog debian/control file_io.cc file_io.hh
        interner.hh manifest.cc monotone.1 monotone.cc monotone.spec
        monotone.texi netcmd.cc netsync.cc options.hh rcs_import.cc
        schema.sql schema_migration.cc tests/t_cvsimport_drepper2.at
        tests/t_migrate_schema.at tests/t_normalized_filenames.at
        tests/t_update_off_branch.at testsuite.at transforms.cc
        ui.cc ui.hh unit_tests.cc unit_tests.hh vocab.hh
        win32/monotone.iss

ChangeLog: 

explicit_merge of e95be13d506eb955b465a30fe7ce192354018384
              and 616ec315888dd5b791999730cf6dcece1f4a3820
   using ancestor 44ed8807bead656889fb5022f974e13a7169098c
        to branch 'net.venge.monotone.cvssync'


monotone --db={your.database} diff 
--revision=616ec315888dd5b791999730cf6dcece1f4a3820 
--revision=4650fb7cb2230e5b5a47164fe082e1394f19066b
monotone --db={your.database} diff 
--revision=e95be13d506eb955b465a30fe7ce192354018384 
--revision=4650fb7cb2230e5b5a47164fe082e1394f19066b
----------------------------------------------------------------------