[Monotone-commits-diffs] Revision 68fe12e6f1de7d161eb9e27dd757e7d230049520

[monotone]

-----------------------------------------------------------------
Revision: 68fe12e6f1de7d161eb9e27dd757e7d230049520
Ancestor: 922e1e1cbdd1443639f33f81c0018013f824a9ec
Ancestor: bdd9f873a879a1bb05d777ab309b4af7589c0352
Author: address@hidden
Date: 2005-04-25T08:43:21
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/t_automate_ancestors.at tests/t_cvspull_combined.at
        tests/t_cvspull_committemplate.at
        tests/t_cvspull_samedirname.at tests/t_cvspull_separate.at
        tests/t_diff_currev.at tests/t_inventory.at
        tests/t_multiple_heads_msg.at
        tests/t_normalized_filenames.at
        tests/t_rename_file_to_dir.at
        tests/t_replace_dir_with_file.at
        tests/t_replace_file_with_dir.at
Modified files:
        ChangeLog Makefile.am app_state.cc app_state.hh automate.cc
        basic_io.cc basic_io.hh change_set.cc commands.cc
        commands.hh contrib/monotone.el cryptopp/dll.cpp
        cryptopp/iterhash.h cryptopp/modarith.h cryptopp/modes.h
        cryptopp/osrng.cpp cryptopp/osrng.h cryptopp/strciphr.h
        database.cc file_io.cc inodeprint.cc manifest.cc manifest.hh
        monotone.1 monotone.cc monotone.texi revision.hh
        std_hooks.lua tests/t_add_stomp_file.at tests/t_drop_attr.at
        tests/t_i18n_file.at tests/t_log_depth.at
        tests/t_log_depth_single.at tests/t_netsync_largish_file.at
        tests/t_setup_checkout_modify_new_dir.at
        tests/t_status_missing.at tests/t_sticky_branch.at
        testsuite.at transforms.cc transforms.hh ui.cc ui.hh
        unix/inodeprint.cc vocab.cc vocab.hh vocab_terms.hh
        win32/inodeprint.cc work.cc

ChangeLog: 

explicit_merge of bdd9f873a879a1bb05d777ab309b4af7589c0352
              and 922e1e1cbdd1443639f33f81c0018013f824a9ec
   using ancestor d5d59ce20fbd066d340e5f02293730427fd2135a
        to branch 'net.venge.monotone.cvssync'


monotone --db={your.database} diff 
--revision=922e1e1cbdd1443639f33f81c0018013f824a9ec 
--revision=68fe12e6f1de7d161eb9e27dd757e7d230049520
monotone --db={your.database} diff 
--revision=bdd9f873a879a1bb05d777ab309b4af7589c0352 
--revision=68fe12e6f1de7d161eb9e27dd757e7d230049520
----------------------------------------------------------------------