[Monotone-commits-diffs] Revision f7b0a027130f3f66d06fadc5df98117f945eac6f

[monotone]

-----------------------------------------------------------------
Revision: f7b0a027130f3f66d06fadc5df98117f945eac6f
Ancestor: 967ef7ddaabbb956506fde04bc2a62d449d5db56
Ancestor: ddfbad572e58808e973ca5d3e68f4802a1fae145
Author: address@hidden
Date: 2005-05-13T15:09:41
Branch: net.venge.monotone.cvssync

Renamed files:
        tests/t_inventory.at to tests/t_automate_inventory.at
        tests/t_update_inodeprints.at to tests/t_refresh_inodeprints.at
Added files:
        CVS_prot HACKING contrib/monoprof.sh contrib/monotone-nav.el
        contrib/monotone.zsh_completion cryptopp/md5.cpp
        cryptopp/md5.h cvs_client.cc cvs_client.hh cvs_repository.cc
        cvs_sync.hh debian/compat options.hh restrictions.cc
        restrictions.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_copy_all.at tests/t_commit_message_file.at
        tests/t_cvsimport3.at tests/t_cvsimport_deleted_invar.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_patch_rename.at tests/t_monotone_up.at
        tests/t_options.at tests/t_rcfile_stdin.at
        tests/t_unreadable_MT.at tests/t_update_inodeprints.at
Modified files:
        .mt-attrs AUTHORS ChangeLog INSTALL Makefile.am NEWS UPGRADE
        annotate.cc app_state.cc app_state.hh automate.cc
        basic_io.cc basic_io.hh change_set.cc commands.cc
        commands.hh configure.ac constants.cc
        contrib/monotone-notify.pl contrib/monotone.bash_completion
        contrib/monotone.el cryptopp/cryptlib.h cycle_detector.hh
        database.cc database_check.hh debian/changelog
        debian/control debian/copyright debian/docs debian/info
        debian/rules diff_patch.cc diff_patch.hh file_io.cc
        file_io.hh interner.hh lcs.cc lua.cc lua.hh manifest.cc
        manifest.hh mkstemp.cc monotone.1 monotone.cc monotone.spec
        monotone.texi netio.hh netsync.cc netsync.hh netxx/osutil.h
        packet.cc packet.hh platform.hh po/monotone.pot
        randomfile.hh rcs_file.cc rcs_import.cc revision.cc
        selectors.cc selectors.hh std_hooks.lua tests/README
        tests/t_add_intermediate_MT_path.at
        tests/t_automate_heads.at tests/t_automate_inventory.at
        tests/t_automate_select.at tests/t_cvsimport2.at
        tests/t_cvsimport_manifest_cycle.at tests/t_delete_dir.at
        tests/t_merge_6.at tests/t_netsync_sigpipe.at
        tests/t_netsync_single.at tests/t_override_author_date.at
        tests/t_rcfile_required.at tests/t_refresh_inodeprints.at
        tests/t_sticky_branch.at tests/t_tags.at
        tests/t_update_missing.at testsuite.at transforms.cc
        transforms.hh ui.cc ui.hh unix/get_system_flavour.cc
        unix/inodeprint.cc unix/process.cc vocab.cc
        win32/get_system_flavour.cc win32/inodeprint.cc
        win32/monotone.iss win32/process.cc work.cc work.hh
        xdelta.cc xdelta.hh

ChangeLog: 

explicit_merge of 967ef7ddaabbb956506fde04bc2a62d449d5db56
              and ddfbad572e58808e973ca5d3e68f4802a1fae145
   using ancestor 07e3c64db31734efc2a3ca94d8f4dbd9c51c0e43
        to branch 'net.venge.monotone.cvssync'


monotone --db={your.database} diff 
--revision=967ef7ddaabbb956506fde04bc2a62d449d5db56 
--revision=f7b0a027130f3f66d06fadc5df98117f945eac6f
monotone --db={your.database} diff 
--revision=ddfbad572e58808e973ca5d3e68f4802a1fae145 
--revision=f7b0a027130f3f66d06fadc5df98117f945eac6f
----------------------------------------------------------------------