[Monotone-commits-diffs] Revision f1446484bea3ca274c7a5449c33dbe9c34f591f7

[monotone]

-----------------------------------------------------------------
Revision: f1446484bea3ca274c7a5449c33dbe9c34f591f7
Ancestor: 14e874d1405525e7c6489f3d6a088212b959c012
Ancestor: 7ebca371a829db670c8d1a4f38dbd92ceb18e853
Author: address@hidden
Date: 2006-05-24T20:11:41
Branch: net.venge.monotone.cvssync

Renamed entries:
        lua.cc to lua_hooks.cc
        lua.hh to lua_hooks.hh
        tests/t_merge_lca.at to tests/t_merge_7.at
Added files:
        CVS_prot botan/md5.cpp botan/md5.h charset.cc charset.hh
        figures/monotone-logo.svg libmtn/Makefile.am
        localized_file_io.cc localized_file_io.hh lua.cc lua.hh
        mtn_cvs/Makefile.am mtn_cvs/cvs_client.cc
        mtn_cvs/cvs_client.hh mtn_cvs/cvs_sync.cc
        mtn_cvs/cvs_sync.hh mtn_cvs/mtn_cvs.cc piece_table.cc
        piece_table.hh simplestring_xform.cc simplestring_xform.hh
        stringtok.hh tester.cc tester.lua
        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_reallyquiet.at vocab_macros.hh
Added directories:
        libmtn mtn_cvs
Modified files:
        ChangeLog Makefile.am annotate.cc app_state.cc app_state.hh
        automate.cc basic_io.cc basic_io.hh cert.cc cert.hh
        cmd_db.cc cmd_diff_log.cc cmd_files.cc cmd_key_cert.cc
        cmd_list.cc cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc
        commands.cc configure.ac constants.cc constants.hh
        crypto_tests.cc cset.cc database.cc database_check.cc
        debian/changelog diff_patch.cc file_io.cc file_io.hh
        inodeprint.hh keys.cc keys.hh legacy.cc legacy.hh
        lua_hooks.cc lua_hooks.hh monotone.cc monotone.texi
        netsync.cc netxx/accept.cxx netxx/datagram.cxx
        netxx/osutil.cxx netxx/osutil.h netxx/peer.cxx
        netxx/probe_select.cxx netxx/recvfrom.cxx
        netxx/resolve_gethostbyname.cxx netxx/serverbase.cxx
        netxx/socket.cxx netxx/sockopt.cxx netxx/streambase.cxx
        netxx/streamserver.cxx options.hh packet.cc paths.cc
        paths.hh po/de.po po/sv.po rcs_import.cc revision.cc
        revision.hh roster.cc roster.hh sanity.cc sanity.hh
        tests/t_merge_7.at tests/t_quiet.at testsuite.at
        transforms.cc transforms.hh ui.cc ui.hh unit_tests.cc
        unit_tests.hh update.cc vocab.cc vocab.hh vocab_terms.hh
        win32/fs.cc win32/get_system_flavour.cc work.cc work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone.cvssync.win32' (head 
7ebca371a829db670c8d1a4f38dbd92ceb18e853)
            to branch 'net.venge.monotone.cvssync' (head 
14e874d1405525e7c6489f3d6a088212b959c012)


monotone --db={your.database} diff 
--revision=14e874d1405525e7c6489f3d6a088212b959c012 
--revision=f1446484bea3ca274c7a5449c33dbe9c34f591f7
monotone --db={your.database} diff 
--revision=7ebca371a829db670c8d1a4f38dbd92ceb18e853 
--revision=f1446484bea3ca274c7a5449c33dbe9c34f591f7
----------------------------------------------------------------------