[Monotone-commits-diffs] Revision 69adcc54a753c2c3e3177ec14dd397820b127f03

[monotone]

-----------------------------------------------------------------
Revision: 69adcc54a753c2c3e3177ec14dd397820b127f03
Ancestor: 0ec3049388fb13752232a1164fcef900508d5f0f
Ancestor: ef39de24eccef9b22490d48964acbfadedfc133f
Author: address@hidden
Date: 2007-09-08T10:56:19
Branch: net.venge.monotone.experiment.encapsulation

Added files:
        README.encapsulation contrib/diff3_keep_conflicts_merger.lua
        contrib/monotone-mail-notify-standalone.lua
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 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
        monotone.texi netsync.cc packet.cc packet.hh project.cc
        project.hh rcs_import.cc revision.cc revision.hh roster.cc
        roster.hh schema_migration.cc selectors.cc selectors.hh
        std_hooks.lua tester.cc
        tests/checkout_validates_target_directory/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/spawn_redirected_hook_helper/__driver__.lua update.cc

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
ef39de24eccef9b22490d48964acbfadedfc133f)
            to branch 'net.venge.monotone.experiment.encapsulation' (head 
0ec3049388fb13752232a1164fcef900508d5f0f)


monotone --db={your.database} diff 
--revision=0ec3049388fb13752232a1164fcef900508d5f0f 
--revision=69adcc54a753c2c3e3177ec14dd397820b127f03
monotone --db={your.database} diff 
--revision=ef39de24eccef9b22490d48964acbfadedfc133f 
--revision=69adcc54a753c2c3e3177ec14dd397820b127f03
----------------------------------------------------------------------