[Monotone-commits-diffs] Revision f23365eb84efd3422d7f44f761f84644b489b579

[monotone]

-----------------------------------------------------------------
Revision: f23365eb84efd3422d7f44f761f84644b489b579
Ancestor: 91803b3bcf5f341c0c58dd10d58df9047e960cb1
Ancestor: e65bc11b6670a0b2ed8e72214cb81d94e6a9a2d1
Author: address@hidden
Date: 2005-08-25T08:54:11
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_cvspull_combined.at
        tests/t_cvspull_committemplate.at
        tests/t_cvspull_samedirname.at tests/t_cvspull_separate.at
        tests/t_diff_external.at
Modified files:
        AUTHORS ChangeLog Makefile.am NEWS UPGRADE app_state.cc
        app_state.hh commands.cc configure.ac database.cc
        debian/changelog diff_patch.cc diff_patch.hh lua.cc lua.hh
        lua/lapi.c lua/lapi.h lua/lauxlib.c lua/lauxlib.h
        lua/lbaselib.c lua/lcode.c lua/lcode.h lua/ldblib.c
        lua/ldebug.c lua/ldebug.h lua/ldo.c lua/ldo.h lua/ldump.c
        lua/lfunc.c lua/lfunc.h lua/lgc.c lua/lgc.h lua/liolib.c
        lua/llex.c lua/llex.h lua/llimits.h lua/lmathlib.c
        lua/lmem.c lua/lmem.h lua/loadlib.c lua/lobject.c
        lua/lobject.h lua/lopcodes.c lua/lopcodes.h lua/lparser.c
        lua/lparser.h lua/lstate.c lua/lstate.h lua/lstring.c
        lua/lstring.h lua/lstrlib.c lua/ltable.c lua/ltable.h
        lua/ltablib.c lua/ltests.c lua/ltm.c lua/ltm.h lua/lua.h
        lua/lualib.h lua/lundump.c lua/lundump.h lua/lvm.c lua/lvm.h
        lua/lzio.c lua/lzio.h manifest.cc monotone.cc monotone.spec
        monotone.texi options.hh std_hooks.lua tests/t_crlf.at
        tests/t_restrictions.at testsuite.at ui.cc ui.hh vocab.hh
        win32/monotone.iss

ChangeLog: 

explicit_merge of e65bc11b6670a0b2ed8e72214cb81d94e6a9a2d1
              and 91803b3bcf5f341c0c58dd10d58df9047e960cb1
   using ancestor 2f9b810bc98cb5d788518797b0fab805f05964fa
        to branch 'net.venge.monotone.cvssync'


monotone --db={your.database} diff 
--revision=91803b3bcf5f341c0c58dd10d58df9047e960cb1 
--revision=f23365eb84efd3422d7f44f761f84644b489b579
monotone --db={your.database} diff 
--revision=e65bc11b6670a0b2ed8e72214cb81d94e6a9a2d1 
--revision=f23365eb84efd3422d7f44f761f84644b489b579
----------------------------------------------------------------------