[Monotone-commits-diffs] Revision 1f4899bea28adfd740ebf1bf7b7e92425056b436

[monotone]

-----------------------------------------------------------------
Revision: 1f4899bea28adfd740ebf1bf7b7e92425056b436
Ancestor: 96698ea2638bbeaee2c7e9365f9ce51bfca9efcd
Ancestor: e01cd7fe4523772fec1ed9cbc5fd000abc8453f6
Author: address@hidden
Date: 2005-12-08T08:55:38
Branch: net.venge.monotone.cvssync

Added files:
        CVS_prot botan/md5.cpp botan/md5.h cvs_client.cc
        cvs_client.hh cvs_sync.cc cvs_sync.hh piece_table.cc
        piece_table.hh stringtok.hh tests/t_cvspull_combined.at
        tests/t_cvspull_committemplate.at
        tests/t_cvspull_cvsbranch.at tests/t_cvspull_md5fail.at
        tests/t_cvspull_rapid.at tests/t_cvspull_samedirname.at
        tests/t_cvspull_separate.at tests/t_cvspull_xmodule.at
        tests/t_cvspush_loop.at tests/t_cvstakeover_modified.at
        tests/t_read_privkey.at
Modified files:
        ChangeLog Makefile.am app_state.cc app_state.hh commands.cc
        contrib/usher.cc key_store.cc monotone.cc monotone.texi
        netxx/serverbase.cxx netxx/sockopt.cxx netxx/sockopt.h
        options.hh packet.cc packet.hh po/fr.po rcs_import.cc
        tests/t_dropkey_2.at testsuite.at ui.cc ui.hh

ChangeLog: 

propagate from branch 'net.venge.monotone.cvssync.win32' (head 
e01cd7fe4523772fec1ed9cbc5fd000abc8453f6)
            to branch 'net.venge.monotone.cvssync' (head 
96698ea2638bbeaee2c7e9365f9ce51bfca9efcd)


monotone --db={your.database} diff 
--revision=96698ea2638bbeaee2c7e9365f9ce51bfca9efcd 
--revision=1f4899bea28adfd740ebf1bf7b7e92425056b436
monotone --db={your.database} diff 
--revision=e01cd7fe4523772fec1ed9cbc5fd000abc8453f6 
--revision=1f4899bea28adfd740ebf1bf7b7e92425056b436
----------------------------------------------------------------------