[Monotone-commits-diffs] Revision 6f3bdac13d2cc6be1d928437b5d8696bde9496c9

[monotone]

-----------------------------------------------------------------
Revision: 6f3bdac13d2cc6be1d928437b5d8696bde9496c9
Ancestor: 0ea65cb31b3c5b6a91d7039448684b33586d14fd
Ancestor: 8f76ec63ffb2ce9be90e187c3b6e72b354684be4
Author: address@hidden
Date: 2008-01-18T19:18:46
Branch: net.venge.monotone.experiment.encapsulation

Added files:
        tests/automate_inventory_ignore_dirs/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected.stderr
        tests/automate_inventory_ignore_dirs/expected.stdout
        tests/automate_inventory_ignore_dirs/local_hooks.lua
        tests/automate_inventory_options/__driver__.lua
        tests/automate_inventory_options/expected-no-ignored.stdout
        tests/automate_inventory_options/expected-no-unchanged.stdout
        tests/automate_inventory_options/expected-no-unknown.stdout
        tests/automate_inventory_options/expected-none.stdout
        tests/automate_inventory_options/test_hooks.lua
Added directories:
        tests/automate_inventory_ignore_dirs
        tests/automate_inventory_options
Modified files:
        NEWS README.encapsulation annotate.cc annotate.hh
        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_ws_commit.cc commands.cc database.cc database.hh
        enumerator.cc enumerator.hh monotone.texi netcmd.hh
        netsync.cc options_list.hh po/it.po rcs_import.cc
        rcs_import.hh restrictions.cc restrictions.hh update.cc
        update.hh work.cc work.hh

ChangeLog: 

merge of '0ea65cb31b3c5b6a91d7039448684b33586d14fd'
     and '8f76ec63ffb2ce9be90e187c3b6e72b354684be4'


monotone --db={your.database} diff 
--revision=0ea65cb31b3c5b6a91d7039448684b33586d14fd 
--revision=6f3bdac13d2cc6be1d928437b5d8696bde9496c9
monotone --db={your.database} diff 
--revision=8f76ec63ffb2ce9be90e187c3b6e72b354684be4 
--revision=6f3bdac13d2cc6be1d928437b5d8696bde9496c9
----------------------------------------------------------------------