[Monotone-commits-diffs] Revision b5197b03978b5562eece3593b1b27d86afa1f9cd

[monotone]

-----------------------------------------------------------------
Revision: b5197b03978b5562eece3593b1b27d86afa1f9cd
Ancestor: 26766477ac2c96aabfa90a681bb6594d12eb53fa
Ancestor: fdf5dc363403dbb5a553056d09453902adf5c85e
Author: address@hidden
Date: 2007-08-01T22:21:45
Branch: net.venge.monotone.experiment.encapsulation

Added files:
        README.encapsulation contrib/Monotone.pm
        tests/test_a_merge_9/__driver__.lua
        tests/test_a_merge_9/left tests/test_a_merge_9/parent
        tests/test_a_merge_9/right
Added directories:
        tests/test_a_merge_9
Modified files:
        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_packet.cc cmd_ws_commit.cc
        commands.cc contrib/README contrib/monotone-notify.pl
        database.cc database.hh database_check.cc diff_patch.cc
        key_store.cc key_store.hh keys.cc keys.hh legacy.cc
        legacy.hh merge.cc merge.hh netsync.cc packet.cc packet.hh
        po/de.po project.cc project.hh rcs_import.cc revision.cc
        revision.hh roster.cc roster.hh schema_migration.cc
        selectors.cc selectors.hh sqlite/vdbe.c update.cc

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
26766477ac2c96aabfa90a681bb6594d12eb53fa)
            to branch 'net.venge.monotone.experiment.encapsulation' (head 
fdf5dc363403dbb5a553056d09453902adf5c85e)


monotone --db={your.database} diff 
--revision=26766477ac2c96aabfa90a681bb6594d12eb53fa 
--revision=b5197b03978b5562eece3593b1b27d86afa1f9cd
monotone --db={your.database} diff 
--revision=fdf5dc363403dbb5a553056d09453902adf5c85e 
--revision=b5197b03978b5562eece3593b1b27d86afa1f9cd
----------------------------------------------------------------------