[Monotone-commits-diffs] Revision 616ec315888dd5b791999730cf6dcece1f4a3820

[monotone]

-----------------------------------------------------------------
Revision: 616ec315888dd5b791999730cf6dcece1f4a3820
Ancestor: 44ed8807bead656889fb5022f974e13a7169098c
Ancestor: 7b88f7c9b843cae0b068b5232edf812c9b2b367d
Author: address@hidden
Date: 2005-08-25T08:46:42
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 globish.cc
        globish.hh hmac.cc hmac.hh sqlite/callback.c
        sqlite/prepare.c 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_cvsimport_drepper2.at tests/t_cvspull_combined.at
        tests/t_cvspull_committemplate.at
        tests/t_cvspull_samedirname.at tests/t_cvspull_separate.at
        tests/t_db_kill_branch_locally.at tests/t_existsonpath.at
        tests/t_netsync_globs.at
Modified files:
        AUTHORS ChangeLog INSTALL Makefile.am NEWS UPGRADE
        app_state.cc app_state.hh automate.cc basic_io.hh cert.cc
        change_set.cc commands.cc configure.ac constants.cc
        constants.hh contrib/ciabot_monotone.py
        contrib/monotone-import.pl contrib/mtbrowse.sh
        cryptopp/config.h cryptopp/integer.cpp database.cc
        database.hh debian/changelog debian/control debian/rules
        file_io.cc keys.cc keys.hh lua.cc lua.hh main.cc
        merkle_tree.cc merkle_tree.hh monotone.1 monotone.cc
        monotone.spec monotone.texi netcmd.cc netcmd.hh netsync.cc
        netsync.hh netxx/osutil.h options.hh packet.cc
        po/monotone.pot rcs_file.cc rcs_import.cc rcs_import.hh
        revision.cc sqlite/alter.c sqlite/btree.c sqlite/build.c
        sqlite/delete.c sqlite/expr.c sqlite/func.c sqlite/insert.c
        sqlite/keywordhash.h sqlite/main.c sqlite/opcodes.c
        sqlite/opcodes.h sqlite/os.h sqlite/os_unix.c
        sqlite/os_unix.h sqlite/os_win.c sqlite/pager.c
        sqlite/pager.h sqlite/parse.c sqlite/parse.h sqlite/pragma.c
        sqlite/random.c sqlite/select.c sqlite/sqlite3.h
        sqlite/sqliteInt.h sqlite/tokenize.c sqlite/trigger.c
        sqlite/update.c sqlite/util.c sqlite/vacuum.c sqlite/vdbe.c
        sqlite/vdbe.h sqlite/vdbeInt.h sqlite/vdbeapi.c
        sqlite/vdbeaux.c sqlite/vdbemem.c sqlite/where.c
        std_hooks.lua tests/t_automate_stdio.at
        tests/t_cvsimport_drepper.at tests/t_db_kill_rev_locally.at
        tests/t_diff_currev.at tests/t_netsync_defaults.at
        tests/t_netsync_diffbranch.at tests/t_netsync_permissions.at
        tests/t_netsync_single.at tests/t_selector_later_earlier.at
        testsuite.at transforms.cc transforms.hh ui.cc ui.hh
        unit_tests.cc unit_tests.hh unix/process.cc vocab.cc
        vocab.hh vocab_terms.hh

ChangeLog: 

explicit_merge of 44ed8807bead656889fb5022f974e13a7169098c
              and 7b88f7c9b843cae0b068b5232edf812c9b2b367d
   using ancestor 76a3c8d6e258681afd550ca3fed3cf776fe7a795
        to branch 'net.venge.monotone.cvssync'


monotone --db={your.database} diff 
--revision=44ed8807bead656889fb5022f974e13a7169098c 
--revision=616ec315888dd5b791999730cf6dcece1f4a3820
monotone --db={your.database} diff 
--revision=7b88f7c9b843cae0b068b5232edf812c9b2b367d 
--revision=616ec315888dd5b791999730cf6dcece1f4a3820
----------------------------------------------------------------------