[Monotone-commits-nodiffs] Revision 9705e10e5e7b2c2e7365756f3ad6e1c619fd9f60

[monotone]

-----------------------------------------------------------------
Revision: 9705e10e5e7b2c2e7365756f3ad6e1c619fd9f60
Ancestor: 60d3e38bb0a88f235f7e9e51115cf239809f129d
Ancestor: 734c39bb873f8fc83b8d54a7ad8e7a028864e4fc
Author: address@hidden
Date: 2005-05-24T07:56:20
Branch: net.venge.monotone.cvssync

Deleted files:
        contrib/Log2Gxl.java
Added files:
        CVS_prot contrib/mtbrowse.sh 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_annotate_lineage_dependent.at
        tests/t_annotate_split_line.at tests/t_automate_certs.at
        tests/t_cvspull_combined.at
        tests/t_cvspull_committemplate.at
        tests/t_cvspull_samedirname.at tests/t_cvspull_separate.at
        tests/t_drop_vs_dropadd.at tests/t_merge_binary.at
        tests/t_selector_later_earlier.at
Modified files:
        .mt-attrs ChangeLog Makefile.am annotate.cc annotate.hh
        app_state.cc app_state.hh automate.cc change_set.cc
        commands.cc constants.cc constants.hh contrib/README
        database.cc debian/control debian/rules lua.cc lua.hh
        monotone.1 monotone.cc monotone.texi options.hh packet.cc
        sanity.cc sanity.hh selectors.cc selectors.hh std_hooks.lua
        tests/t_annotate.at tests/t_attr.at tests/t_attributes.at
        tests/t_checkout_id_sets_branch.at
        tests/t_checkout_noop_on_fail.at tests/t_checkout_options.at
        tests/t_cwork.at tests/t_delete_dir.at
        tests/t_delete_dir_patch.at tests/t_empty_path.at
        tests/t_i18n_file_data.at tests/t_inodeprints_hook.at
        tests/t_inodeprints_update.at tests/t_largish_file.at
        tests/t_lf_crlf.at tests/t_monotone_up.at
        tests/t_netsync_defaults.at tests/t_netsync_set_defaults.at
        tests/t_persistent_server_revision.at
        tests/t_rename_added_in_rename.at
        tests/t_rename_dir_cross_level.at
        tests/t_rename_dir_patch.at tests/t_short_opts.at
        tests/t_single_char_filenames.at tests/t_subdir_add.at
        tests/t_subdir_attr.at tests/t_subdir_drop.at
        tests/t_subdir_rename.at tests/t_subdir_revert.at
        tests/t_tags.at tests/t_update_off_branch.at
        tests/t_versions.at testsuite.at ui.cc ui.hh
        win32/terminal.cc work.cc work.hh

ChangeLog: 

explicit_merge of 734c39bb873f8fc83b8d54a7ad8e7a028864e4fc
              and 60d3e38bb0a88f235f7e9e51115cf239809f129d
   using ancestor db495d296e478c9b26736989bfeb6cc88666a380
        to branch 'net.venge.monotone.cvssync'


monotone --db={your.database} diff 
--revision=60d3e38bb0a88f235f7e9e51115cf239809f129d 
--revision=9705e10e5e7b2c2e7365756f3ad6e1c619fd9f60
monotone --db={your.database} diff 
--revision=734c39bb873f8fc83b8d54a7ad8e7a028864e4fc 
--revision=9705e10e5e7b2c2e7365756f3ad6e1c619fd9f60
----------------------------------------------------------------------