[Monotone-commits-diffs] Revision 764d710205aaaa16064234311742814b7c21e81f

[monotone]

-----------------------------------------------------------------
Revision: 764d710205aaaa16064234311742814b7c21e81f
Ancestor: 0b5815b1b28b76e33e7c916fb8671aa0d7d29802
Ancestor: e4293b600058fbd5bfe2840074380ba37200d8df
Author: Richard Levitte <address@hidden>
Date: 2009-02-09T09:02:10
Branch: net.venge.monotone

Renamed entries:
        crypto_tests.cc to unit-tests/sha1.cc
        diff_patch.cc to diff_output.cc
        diff_patch.hh to diff_output.hh
        merge.cc to merge_content.cc
        merge.hh to merge_content.hh
        numeric_vocab.cc to unit-tests/numeric_vocab.cc
        roster_merge.cc to merge_roster.cc
        roster_merge.hh to merge_roster.hh
        schema_migration.cc to migrate_schema.cc
        schema_migration.hh to migration.hh
        string_queue.cc to unit-tests/string_queue.cc
        unit_tests.cc to unit_tester.cc
        work_migration.cc to migrate_work.cc
Added files:
        ancestry.cc cmd.cc merge_3way.cc merge_conflict.cc
        migrate_ancestry.cc roster_tests.hh unit-tests/basic_io.cc
        unit-tests/charset.cc unit-tests/commands.cc
        unit-tests/cset.cc unit-tests/dates.cc unit-tests/globish.cc
        unit-tests/graph.cc unit-tests/merge_3way.cc
        unit-tests/merge_roster.cc unit-tests/netcmd.cc
        unit-tests/netxx_pipe.cc unit-tests/option.cc
        unit-tests/outdated_indicator.cc unit-tests/packet.cc
        unit-tests/paths.cc unit-tests/refiner.cc
        unit-tests/restrictions.cc unit-tests/rev_height.cc
        unit-tests/revision.cc unit-tests/roster.cc
        unit-tests/simplestring_xform.cc unit-tests/transforms.cc
        unit-tests/uri.cc unit-tests/vocab.cc unit-tests/xdelta.cc
Added directories:
        unit-tests
Modified files:
        .mtn-ignore Makefile.am app_state.cc app_state.hh
        automate.cc basic_io.cc cert.cc cert.hh charset.cc
        charset.hh cmd.hh cmd_conflicts.cc cmd_db.cc cmd_diff_log.cc
        cmd_files.cc cmd_list.cc cmd_merging.cc cmd_netsync.cc
        cmd_packet.cc cmd_ws_commit.cc commands.cc configure.ac
        cset.cc database.cc database.hh dates.cc diff_output.cc
        diff_output.hh globish.cc graph.cc interner.hh key_store.cc
        key_store.hh keys.cc keys.hh lua_hooks.cc merge_content.cc
        merge_content.hh merge_roster.cc merge_roster.hh
        migrate_schema.cc migrate_work.cc migration.hh monotone.cc
        mt_version.cc netcmd.cc netsync.cc netxx_pipe.cc
        numeric_vocab.hh option.cc option.hh outdated_indicator.cc
        packet.cc packet.hh paths.cc paths.hh po/POTFILES.in
        project.cc project.hh refiner.cc restrictions.cc
        restrictions.hh rev_height.cc rev_types.hh revision.cc
        revision.hh roster.cc roster.hh roster_delta.cc
        roster_delta.hh sanity.cc sanity.hh simplestring_xform.cc
        simplestring_xform.hh ssh_agent.cc tester.cc transforms.cc
        ui.cc ui.hh unit-tests/numeric_vocab.cc unit-tests/sha1.cc
        unit-tests/string_queue.cc unit-testsuite.lua unit_tester.cc
        unit_tests.hh unix/ssh_agent_platform.cc
        unix/ssh_agent_platform.hh uri.cc vocab.cc
        win32/ssh_agent_platform.cc win32/ssh_agent_platform.hh
        work.cc work.hh xdelta.cc

ChangeLog: 

merge of '0b5815b1b28b76e33e7c916fb8671aa0d7d29802'
     and 'e4293b600058fbd5bfe2840074380ba37200d8df'


monotone --db={your.database} diff 
--revision=0b5815b1b28b76e33e7c916fb8671aa0d7d29802 
--revision=764d710205aaaa16064234311742814b7c21e81f
monotone --db={your.database} diff 
--revision=e4293b600058fbd5bfe2840074380ba37200d8df 
--revision=764d710205aaaa16064234311742814b7c21e81f
----------------------------------------------------------------------