[Monotone-commits-diffs] Revision 9bfdd83e400bbc9a321c5809a9c0f5b301cce3f2

[monotone]

-----------------------------------------------------------------
Revision: 9bfdd83e400bbc9a321c5809a9c0f5b301cce3f2
Ancestor: cba5427fbb4d8aaa53f29145a0118ae40d4292a9
Ancestor: f8770ea0da55da4c731c9e5523d7d12af285ea46
Author: Timothy Brownawell  <address@hidden>
Date: 2008-02-04T13:36:17
Branch: net.venge.monotone.experiment.encapsulation

Deleted entries:
        database_check.hh test_hooks.lua
        tests/database_is_closed_on_signal_exit
        tests/database_is_closed_on_signal_exit/__driver__.lua
Added files:
        README.encapsulation
        tests/imp_test_filesync_confdir/__driver__.lua
        tests/merge_update_part_of_file/__driver__.lua
        tests/merge_update_part_of_file/after.diff
        tests/merge_update_part_of_file/before.diff
        tests/merge_update_part_of_file/onechange
        tests/merge_update_part_of_file/original
        tests/merge_update_part_of_file/twochanges
        tests/signature_round_trip/__driver__.lua
        tests/update_with_pending_modification/__driver__.lua
Added directories:
        tests/imp_test_filesync_confdir
        tests/merge_update_part_of_file tests/signature_round_trip
        tests/update_with_pending_modification
Modified files:
        Makefile.am annotate.cc annotate.hh app_state.cc
        app_state.hh asciik.cc automate.cc cert.cc cert.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
        database.cc database.hh database_check.cc diff_patch.cc
        diff_patch.hh enumerator.cc enumerator.hh inodeprint.hh
        key_store.cc key_store.hh keys.cc keys.hh legacy.cc
        legacy.hh lua-testsuite.lua lua_hooks.cc lua_hooks.hh
        merge.cc merge.hh netcmd.hh netsync.cc options_list.hh
        packet.cc packet.hh platform.hh project.cc project.hh
        rcs_import.cc rcs_import.hh restrictions.cc restrictions.hh
        revision.cc revision.hh roster.cc roster.hh
        schema_migration.cc schema_migration.hh selectors.cc
        selectors.hh ssh_agent.cc ssh_agent.hh tests/test_hooks.lua
        unix/ssh_agent_platform.cc unix/ssh_agent_platform.hh
        update.cc update.hh vocab_terms.hh
        win32/ssh_agent_platform.cc win32/ssh_agent_platform.hh
        work.cc work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
cba5427fbb4d8aaa53f29145a0118ae40d4292a9)
            to branch 'net.venge.monotone.experiment.encapsulation' (head 
f8770ea0da55da4c731c9e5523d7d12af285ea46)


monotone --db={your.database} diff 
--revision=cba5427fbb4d8aaa53f29145a0118ae40d4292a9 
--revision=9bfdd83e400bbc9a321c5809a9c0f5b301cce3f2
monotone --db={your.database} diff 
--revision=f8770ea0da55da4c731c9e5523d7d12af285ea46 
--revision=9bfdd83e400bbc9a321c5809a9c0f5b301cce3f2
----------------------------------------------------------------------