[Monotone-commits-nodiffs] Revision 82e2b6e74f958e5b48d3f0896c78c8fa6be83dcc

[monotone]

-----------------------------------------------------------------
Revision: 82e2b6e74f958e5b48d3f0896c78c8fa6be83dcc
Ancestor: 0e07414925e14fc2b00e543587cb9431e0c7f1e4
Ancestor: 307a1bf9505d5f33e45358b525dadf1076426eb5
Author: address@hidden
Date: 2005-09-02T12:22:27
Branch: net.venge.monotone.cvssync

Added files:
        CVS_prot botan/md5.cpp botan/md5.h
        contrib/monotone-cvs-ignore.lua contrib/parse-accounting.pl
        contrib/perf-test.sh 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_cvspull_combined.at
        tests/t_cvspull_committemplate.at
        tests/t_cvspull_samedirname.at tests/t_cvspull_separate.at
        tests/t_mt_ignore.at
Modified files:
        ChangeLog Makefile.am app_state.cc app_state.hh commands.cc
        database.cc file_io.cc file_io.hh lua.cc monotone.cc
        monotone.texi netxx_pipe.cc netxx_pipe.hh options.hh
        paths.cc po/fr.po revision.cc schema.sql std_hooks.lua
        tests/t_add_dot.at tests/t_annotate_branch_collision.at
        tests/t_commit_message_file.at tests/t_db_with_dots.at
        tests/t_empty_path.at tests/t_epoch_unidirectional.at
        tests/t_existsonpath.at tests/t_inodeprints_hook.at
        tests/t_lua_includedir.at tests/t_merge2_add.at
        tests/t_merge2_data.at tests/t_netsync_globs.at
        tests/t_netsync_unrelated.at
        tests/t_persistent_server_revision.at tests/t_rcfile_dir.at
        tests/t_setup_existing_path.at tests/t_sticky_branch.at
        testsuite.at ui.cc ui.hh win32/fs.cc win32/inodeprint.cc

ChangeLog: 

explicit_merge of 0e07414925e14fc2b00e543587cb9431e0c7f1e4
              and 307a1bf9505d5f33e45358b525dadf1076426eb5
   using ancestor d3b35cac4d6a65d3ca370104b59d7ab7c3442045
        to branch 'net.venge.monotone.cvssync'


monotone --db={your.database} diff 
--revision=0e07414925e14fc2b00e543587cb9431e0c7f1e4 
--revision=82e2b6e74f958e5b48d3f0896c78c8fa6be83dcc
monotone --db={your.database} diff 
--revision=307a1bf9505d5f33e45358b525dadf1076426eb5 
--revision=82e2b6e74f958e5b48d3f0896c78c8fa6be83dcc
----------------------------------------------------------------------