[Monotone-commits-diffs] Revision 0d4b216fc31dea8e5d86be49b0aed189d0f0b9c1

[monotone]

-----------------------------------------------------------------
Revision: 0d4b216fc31dea8e5d86be49b0aed189d0f0b9c1
Ancestor: 203b233cfd01ce8742b7d2596be4f9c841113c65
Ancestor: 9705e10e5e7b2c2e7365756f3ad6e1c619fd9f60
Author: address@hidden
Date: 2005-05-27T06:11:50
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
Modified files:
        ChangeLog Makefile.am app_state.cc app_state.hh automate.cc
        commands.cc monotone.1 monotone.cc monotone.texi options.hh
        testsuite.at ui.cc ui.hh

ChangeLog: 

explicit_merge of 9705e10e5e7b2c2e7365756f3ad6e1c619fd9f60
              and 203b233cfd01ce8742b7d2596be4f9c841113c65
   using ancestor 734c39bb873f8fc83b8d54a7ad8e7a028864e4fc
        to branch 'net.venge.monotone.cvssync'


monotone --db={your.database} diff 
--revision=203b233cfd01ce8742b7d2596be4f9c841113c65 
--revision=0d4b216fc31dea8e5d86be49b0aed189d0f0b9c1
monotone --db={your.database} diff 
--revision=9705e10e5e7b2c2e7365756f3ad6e1c619fd9f60 
--revision=0d4b216fc31dea8e5d86be49b0aed189d0f0b9c1
----------------------------------------------------------------------