[Monotone-commits-diffs] Revision 848dca89c1e5227193862639618cef46fd92d3c2

[monotone]

-----------------------------------------------------------------
Revision: 848dca89c1e5227193862639618cef46fd92d3c2
Ancestor: e04824afb168a8535d483364b878b65f281dd748
Ancestor: f1446484bea3ca274c7a5449c33dbe9c34f591f7
Author: address@hidden
Date: 2006-05-24T20:12:50
Branch: net.venge.monotone.cvssync.refactor

Renamed entries:
        CVS_prot to mtn_cvs/CVS_prot
        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:
        charset.cc charset.hh figures/monotone-logo.svg
        localized_file_io.cc localized_file_io.hh lua.cc lua.hh
        simplestring_xform.cc simplestring_xform.hh tester.cc
        tester.lua tests/t_reallyquiet.at vocab_macros.hh
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 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 mtn_cvs/cvs_sync.cc mtn_cvs/cvs_sync.hh
        mtn_cvs/mtn_cvs.cc 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' (head 
f1446484bea3ca274c7a5449c33dbe9c34f591f7)
            to branch 'net.venge.monotone.cvssync.refactor' (head 
e04824afb168a8535d483364b878b65f281dd748)


monotone --db={your.database} diff 
--revision=e04824afb168a8535d483364b878b65f281dd748 
--revision=848dca89c1e5227193862639618cef46fd92d3c2
monotone --db={your.database} diff 
--revision=f1446484bea3ca274c7a5449c33dbe9c34f591f7 
--revision=848dca89c1e5227193862639618cef46fd92d3c2
----------------------------------------------------------------------