[Monotone-commits-diffs] Revision 9d4713c73af9280198cb058870e22d8fb2f38e60

[monotone]

-----------------------------------------------------------------
Revision: 9d4713c73af9280198cb058870e22d8fb2f38e60
Ancestor: ad104e204d08d1779c6d0a5288f90cef64b204f8
Ancestor: e4675069c18a78f06a62a85c33d73e5562065f5d
Author: address@hidden
Date: 2005-04-13T20:20:16
Branch: net.venge.monotone.cvssync

Deleted files:
        debian/compat debian/files debian/monotone.1
Renamed files:
        contrib/Notify.pl to contrib/monotone-notify.pl
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_checkout_id_sets_branch.at
        tests/t_netsync_largish_file.at
        tests/t_setup_checkout_modify_new_dir.at
        tests/t_sticky_branch.at tests/t_update_off_branch.at
Modified files:
        AUTHORS ChangeLog Makefile.am app_state.cc app_state.hh
        cert.cc commands.cc contrib/monotone-notify.pl
        cryptopp/integer.h debian/docs monotone.cc monotone.texi
        rcs_import.cc tests/t_cvsimport.at testsuite.at ui.cc ui.hh
        unix/terminal.cc

ChangeLog: 

explicit_merge of e4675069c18a78f06a62a85c33d73e5562065f5d
              and ad104e204d08d1779c6d0a5288f90cef64b204f8
   using ancestor 9d6ee7ce7351e8a1c3650d1ed4da0fe0e2b89788
        to branch 'net.venge.monotone.cvssync'

txt0308aKxW7b.txt
Description: Diff [ad104e204d08d1779c6d0a5288f90cef64b204f8] -> [9d4713c73af9280198cb058870e22d8fb2f38e60]

txtt01aZuyoOf.txt
Description: Diff [e4675069c18a78f06a62a85c33d73e5562065f5d] -> [9d4713c73af9280198cb058870e22d8fb2f38e60]