[Monotone-commits-diffs] Revision 3d0a7681a226ec8702637f76be617c1bf31d6940

[monotone]

-----------------------------------------------------------------
Revision: 3d0a7681a226ec8702637f76be617c1bf31d6940
Ancestor: 28447cad5918da6ba7e1cb2592ab7280eb9af53b
Ancestor: d3b35cac4d6a65d3ca370104b59d7ab7c3442045
Author: address@hidden
Date: 2005-08-31T15:58:30
Branch: net.venge.monotone.cvssync

Deleted files:
        path_component.cc path_component.hh
Added files:
        CVS_prot botan/md5.cpp botan/md5.h cvs_client.cc
        cvs_client.hh cvs_repository.cc cvs_sync.hh paths.cc
        paths.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_cvspull_combined.at
        tests/t_cvspull_committemplate.at
        tests/t_cvspull_samedirname.at tests/t_cvspull_separate.at
        tests/t_drop_execute.at tests/t_read_from_file.at
        tests/t_rename_execute.at tests/t_setup_existing_path.at
        unix/fs.cc win32/fs.cc
Modified files:
        ChangeLog Makefile.am annotate.cc app_state.cc app_state.hh
        automate.cc basic_io.cc basic_io.hh botan/allocate.cpp
        cert.cc change_set.cc change_set.hh commands.cc constants.hh
        database.cc database.hh database_check.cc diff_patch.cc
        file_io.cc file_io.hh inodeprint.cc interner.hh keys.cc
        keys.hh lua.cc lua.hh manifest.cc manifest.hh mkstemp.cc
        monotone.1 monotone.cc monotone.texi mt_version.cc
        netxx_pipe.cc netxx_pipe.hh options.hh packet.cc platform.hh
        po/fr.po rcs_import.cc rcs_import.hh restrictions.cc
        sanity.cc sanity.hh std_hooks.lua tests/t_attributes.at
        tests/t_checkout_dir.at tests/t_database_check_normalized.at
        tests/t_genkey.at tests/t_normalized_filenames.at
        tests/t_unreadable_MT.at testsuite.at transforms.cc
        transforms.hh ui.cc ui.hh unit_tests.cc unit_tests.hh
        unix/inodeprint.cc vocab.cc vocab_terms.hh work.cc work.hh
        xdelta.cc

ChangeLog: 

explicit_merge of 28447cad5918da6ba7e1cb2592ab7280eb9af53b
              and d3b35cac4d6a65d3ca370104b59d7ab7c3442045
   using ancestor 397ea68166a3ee3957bb95318aae018eb442c828
        to branch 'net.venge.monotone.cvssync'


monotone --db={your.database} diff 
--revision=28447cad5918da6ba7e1cb2592ab7280eb9af53b 
--revision=3d0a7681a226ec8702637f76be617c1bf31d6940
monotone --db={your.database} diff 
--revision=d3b35cac4d6a65d3ca370104b59d7ab7c3442045 
--revision=3d0a7681a226ec8702637f76be617c1bf31d6940
----------------------------------------------------------------------