[Monotone-commits-diffs] Revision bcbb113804537a4ab7e15936a09c94f70551c107

[monotone]

-----------------------------------------------------------------
Revision: bcbb113804537a4ab7e15936a09c94f70551c107
Ancestor: 1e60cf37fc183dc5d56b165ce069bec4b176b1c5
Ancestor: d5d59ce20fbd066d340e5f02293730427fd2135a
Author: address@hidden
Date: 2005-04-20T21:12:32
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_add_executable.at tests/t_attr_init.at
        tests/t_bad_packets.at tests/t_cvspull_combined.at
        tests/t_cvspull_committemplate.at
        tests/t_cvspull_samedirname.at tests/t_cvspull_separate.at
        tests/t_inodeprints_hook.at
Modified files:
        AUTHORS ChangeLog Makefile.am app_state.cc app_state.hh
        automate.cc commands.cc contrib/monotone-import.pl
        contrib/monotone.el file_io.cc lua.cc lua.hh monotone.cc
        monotone.texi platform.hh sanity.hh std_hooks.lua
        tests/t_lf_crlf.at testsuite.at transforms.cc ui.cc ui.hh
        unix/process.cc win32/process.cc work.cc work.hh

ChangeLog: 

explicit_merge of 1e60cf37fc183dc5d56b165ce069bec4b176b1c5
              and d5d59ce20fbd066d340e5f02293730427fd2135a
   using ancestor 5d6db58e742e7f985b395a97f645e6b888d3ce5c
        to branch 'net.venge.monotone.cvssync'


monotone --db={your.database} diff 
--revision=1e60cf37fc183dc5d56b165ce069bec4b176b1c5 
--revision=bcbb113804537a4ab7e15936a09c94f70551c107
monotone --db={your.database} diff 
--revision=d5d59ce20fbd066d340e5f02293730427fd2135a 
--revision=bcbb113804537a4ab7e15936a09c94f70551c107
----------------------------------------------------------------------