[Monotone-commits-diffs] Revision 64f95db646a068f2f892ee4ad172f21c9996e9a2

[monotone]

-----------------------------------------------------------------
Revision: 64f95db646a068f2f892ee4ad172f21c9996e9a2
Ancestor: 182f8fbe9071f1f7bedd4c565ace969531334b50
Ancestor: ac107b3c946859eb52154ed829326196b3758f0e
Author: address@hidden
Date: 2006-06-03T21:48:19
Branch: net.venge.monotone

Modified files:
        ChangeLog adler32.hh annotate.cc annotate.hh app_state.cc
        app_state.hh automate.cc basic_io.cc basic_io.hh cert.cc
        cert.hh charset.cc charset.hh cleanup.hh cmd.hh
        cmd_automate.cc cmd_db.cc cmd_diff_log.cc cmd_files.cc
        cmd_key_cert.cc cmd_list.cc cmd_merging.cc cmd_netsync.cc
        cmd_othervcs.cc cmd_packet.cc cmd_ws_commit.cc commands.cc
        commands.hh constants.cc constants.hh crypto_tests.cc
        cset.cc cset.hh cycle_detector.hh database.cc database.hh
        database_check.cc database_check.hh diff_patch.cc
        diff_patch.hh enumerator.cc enumerator.hh file_io.cc
        globish.cc hash_map.hh hmac.cc hmac.hh inodeprint.cc
        inodeprint.hh interner.hh key_store.cc key_store.hh keys.cc
        keys.hh lcs.cc lcs.hh legacy.cc legacy.hh
        localized_file_io.cc localized_file_io.hh lua.cc lua.hh
        lua_hooks.cc lua_hooks.hh main.cc merge.cc merge.hh
        merkle_tree.cc merkle_tree.hh mkstemp.cc monotone.cc
        mt_version.cc netcmd.cc netcmd.hh netio.hh netsync.cc
        netsync.hh netxx_pipe.cc netxx_pipe.hh packet.cc packet.hh
        parallel_iter.hh paths.cc paths.hh po/it.po quick_alloc.hh
        randomfile.hh rcs_file.cc rcs_file.hh rcs_import.cc
        refiner.cc refiner.hh restrictions.cc restrictions.hh
        revision.cc revision.hh roster.cc roster.hh roster_merge.cc
        roster_merge.hh safe_map.hh sanity.cc sanity.hh
        schema_migration.cc selectors.cc simplestring_xform.cc
        simplestring_xform.hh smap.hh tester.cc transforms.cc
        txt2c.cc ui.cc ui.hh unit_tests.cc update.cc update.hh
        uri.cc vocab.cc vocab.hh vocab_terms.hh win32/os_strerror.cc
        work.cc work.hh xdelta.cc xdelta.hh

ChangeLog: 

merge of 182f8fbe9071f1f7bedd4c565ace969531334b50
     and ac107b3c946859eb52154ed829326196b3758f0e


monotone --db={your.database} diff 
--revision=182f8fbe9071f1f7bedd4c565ace969531334b50 
--revision=64f95db646a068f2f892ee4ad172f21c9996e9a2
monotone --db={your.database} diff 
--revision=ac107b3c946859eb52154ed829326196b3758f0e 
--revision=64f95db646a068f2f892ee4ad172f21c9996e9a2
----------------------------------------------------------------------