[Monotone-commits-nodiffs] Revision 85dad804e2577583039130345ba96ed3c4d83bd5

[monotone]

-----------------------------------------------------------------
Revision: 85dad804e2577583039130345ba96ed3c4d83bd5
Ancestor: 005d115dfa981a71a8314cf964d3ce00477ce097
Ancestor: a500bbe59aba180f67428ab5d734b294487e9144
Author: address@hidden
Date: 2010-05-20 19.09.17
Branch: net.venge.monotone.experiment.database-management

Renamed entries:
        tests/restricted_diff_bug to tests/restricted_diff_file_in_renamed_dir
        tests/restriction_excludes_parent_dir to 
tests/restriction_includes_parent_dir
Added files:
        
tests/automate_inventory_options/expected-renames-target-no-unchanged.stdout
Modified files:
        NEWS cmd_list.cc cmd_netsync.cc cmd_ws_commit.cc database.cc
        database.hh lua_hooks.cc lua_hooks.hh monotone.cc
        monotone.texi options_list.hh paths.hh restrictions.cc
        restrictions.hh std_hooks.lua
        tests/automate_inventory_ignore_dirs/expected.stderr
        tests/automate_inventory_ignore_dirs/expected.stdout
        tests/automate_inventory_ignore_dirs/expected_2.stderr
        tests/automate_inventory_ignore_dirs/expected_2.stdout
        tests/automate_inventory_options/__driver__.lua
        tests/automate_inventory_options/expected-no-ignored.stdout
        tests/automate_inventory_options/expected-no-unknown.stdout
        tests/automate_inventory_options/expected-none.stdout
        tests/automate_inventory_options/expected-renames-both.stdout
        tests/automate_inventory_options/expected-renames-source.stdout
        
tests/automate_inventory_options/expected-renames-target-no-ignored.stdout
        
tests/automate_inventory_options/expected-renames-target-no-unknown.stdout
        tests/automate_inventory_options/expected-renames-target.stdout
        tests/automate_inventory_restricted/__driver__.lua
        tests/diff_against_empty_file/__driver__.lua
        tests/diff_on_missing_trailing_newline_at_end_of_file/__driver__.lua
        tests/diff_restriction_renamed_parent/__driver__.lua
        tests/fetching_nonexistent_entry_from_children_bug/__driver__.lua
        tests/log_dir/__driver__.lua
        tests/log_with_restriction/__driver__.lua
        tests/manifest_restrictions/__driver__.lua
        tests/merge_into_workspace/__driver__.lua
        tests/merge_update_part_of_file/__driver__.lua
        tests/restricted_diff_file_in_renamed_dir/__driver__.lua
        tests/restriction_includes_parent_dir/__driver__.lua
        tests/restrictions_with_renames_and_adds/__driver__.lua
        tests/revert_file_to_base_revision/__driver__.lua
        tests/subdirectory_restrictions/__driver__.lua
        tests/use_restrictions_with_--exclude/__driver__.lua
        unit-tests/restrictions.cc vocab.hh work.cc

ChangeLog: 

merge of '005d115dfa981a71a8314cf964d3ce00477ce097'
     and 'a500bbe59aba180f67428ab5d734b294487e9144'


monotone --db={your.database} diff 
--revision=005d115dfa981a71a8314cf964d3ce00477ce097 
--revision=85dad804e2577583039130345ba96ed3c4d83bd5
monotone --db={your.database} diff 
--revision=a500bbe59aba180f67428ab5d734b294487e9144 
--revision=85dad804e2577583039130345ba96ed3c4d83bd5
----------------------------------------------------------------------