[Monotone-commits-diffs] Revision 2daff9ed06cb5131628166327270dd728a80059d

[monotone]

-----------------------------------------------------------------
Revision: 2daff9ed06cb5131628166327270dd728a80059d
Ancestor: 76a3c8d6e258681afd550ca3fed3cf776fe7a795
Ancestor: 8de712e626a3fd1d136dd3f32f1d11d6c987dae6
Author: address@hidden
Date: 2005-06-21T06:46:49
Branch: net.venge.monotone.cvssync

Deleted files:
        tests/t_merge_binary.at
Added files:
        CVS_prot contrib/color-logs.conf contrib/color-logs.sh
        contrib/colorize contrib/get_stdio.pl 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_automate_stdio.at tests/t_cvsimport_drepper.at
        tests/t_cvspull_combined.at
        tests/t_cvspull_committemplate.at
        tests/t_cvspull_samedirname.at tests/t_cvspull_separate.at
        tests/t_lua_includedir.at tests/t_merge_manual.at
        tests/t_rcfile_dir.at
        tests/t_restricted_commit_with_inodeprints.at
        tests/t_revert_restrict.at tests/t_status.at
        tests/t_update_with_pending_add.at
        tests/t_update_with_pending_drop.at
        tests/t_update_with_pending_rename.at
Modified files:
        .mt-attrs AUTHORS ChangeLog HACKING INSTALL Makefile.am
        ROADMAP app_state.cc app_state.hh automate.cc commands.cc
        constants.cc contrib/ciabot_monotone.py contrib/monoprof.sh
        contrib/monotone-notify.pl contrib/monotone.el
        contrib/monotone.zsh_completion contrib/mtbrowse.sh
        database.cc database.hh debian/docs debian/rules
        diff_patch.cc diff_patch.hh file_io.cc file_io.hh lua.cc
        lua.hh main.cc monotone.cc monotone.texi netcmd.cc netcmd.hh
        netsync.cc netsync.hh options.hh packet.cc packet.hh
        po/monotone.pot rcs_import.cc revision.cc revision.hh
        std_hooks.lua tests/t_add_stomp_file.at
        tests/t_add_vs_commit.at tests/t_annotate.at
        tests/t_automate_certs.at tests/t_bad_packets.at
        tests/t_cat_file_by_name.at
        tests/t_cvsimport_deleted_invar.at tests/t_epoch_server.at
        tests/t_epoch_unidirectional.at tests/t_fmerge.at
        tests/t_i18n_changelog.at tests/t_i18n_file.at
        tests/t_lf_crlf.at tests/t_log_depth.at
        tests/t_log_depth_single.at
        tests/t_merge_normalization_edge_case.at
        tests/t_netsync_defaults.at tests/t_netsync_diffbranch.at
        tests/t_netsync_error.at tests/t_netsync_permissions.at
        tests/t_netsync_set_defaults.at tests/t_netsync_single.at
        tests/t_options.at tests/t_rebuild.at
        tests/t_restrictions.at tests/t_select_cert.at
        tests/t_selector_later_earlier.at tests/t_tags.at
        tests/t_update_nonexistent.at tests/t_update_off_branch.at
        tests/t_update_to_revision.at testsuite.at ui.cc ui.hh
        vocab.hh vocab_terms.hh work.cc work.hh

ChangeLog: 

explicit_merge of 8de712e626a3fd1d136dd3f32f1d11d6c987dae6
              and 76a3c8d6e258681afd550ca3fed3cf776fe7a795
   using ancestor 203b233cfd01ce8742b7d2596be4f9c841113c65
        to branch 'net.venge.monotone.cvssync'


monotone --db={your.database} diff 
--revision=76a3c8d6e258681afd550ca3fed3cf776fe7a795 
--revision=2daff9ed06cb5131628166327270dd728a80059d
monotone --db={your.database} diff 
--revision=8de712e626a3fd1d136dd3f32f1d11d6c987dae6 
--revision=2daff9ed06cb5131628166327270dd728a80059d
----------------------------------------------------------------------