[Monotone-commits-nodiffs] Revision 46320bb52564bc1bb3c95a6a6fcfeb7feafe98fe

[monotone]

-----------------------------------------------------------------
Revision: 46320bb52564bc1bb3c95a6a6fcfeb7feafe98fe
Ancestor: 0974195ed088d0bb1354185a79810324c21f01bf
Ancestor: 4bee0e0964af5c65d8cabf9c3f81eec0a55213ac
Author: Timothy Brownawell  <address@hidden>
Date: 2010-05-26 13.36.02
Branch: net.venge.monotone.tbrownaw.policy-branches

Deleted entries:
        tests/(todo)_write_monotone-agent
        tests/(todo)_write_monotone-agent/__driver__.lua
Renamed entries:
        tests/commit_using__MTN_log/commit_log.lua to 
tests/commit_using__MTN_log/commit_cancelled.lua
        tests/commit_using__MTN_log/commit_log_modified_return.lua to 
tests/commit_using__MTN_log/commit_confirmed.lua
        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:
        branch_name.cc branch_name.hh cmd_policy.cc
        maybe_workspace_updater.cc maybe_workspace_updater.hh
        policies/base_policy.cc policies/base_policy.hh
        policies/branch.cc policies/branch.hh policies/delegation.cc
        policies/delegation.hh policies/editable_policy.cc
        policies/editable_policy.hh policies/outdatable_policy.cc
        policies/outdatable_policy.hh policies/policy.cc
        policies/policy.hh policies/policy_branch.cc
        policies/policy_branch.hh rev_output.cc rev_output.hh
        
tests/automate_inventory_options/expected-renames-target-no-unchanged.stdout
        tests/bad_and_unknown_certs/__driver__.lua
        tests/branch_leaves_sync_bug/__driver__.lua
        tests/catch_lua_output/__driver__.lua
        tests/catch_lua_output/hooks.lua
        tests/catch_lua_output/hooks_automate.lua
        tests/cert_no_branch/__driver__.lua
        tests/changelog_editor/__driver__.lua
        tests/changelog_editor/changelog.lua
        tests/db_check_branch_leaves/__driver__.lua
        tests/disapproving_a_non_head/__driver__.lua
        tests/keep_valid_workspace_options_on_error/__driver__.lua
        tests/log_recognizes_invalid_workspace_parent/__driver__.lua
        tests/log_with_windows_dirsep/__driver__.lua
        tests/merge_--update/__driver__.lua
        tests/netsync_per_server_defaults/__driver__.lua
        tests/policy-basic/__driver__.lua
        tests/policy-keys/__driver__.lua
        tests/policy-netsync/__driver__.lua
        tests/policy-subpolicies/__driver__.lua
        tests/policy-tags/__driver__.lua
        tests/setup_and_clone_keep_bookkeeping_dir/__driver__.lua
        tests/setup_creates_internal_db/__driver__.lua
        tests/unchanged_options_preserves_mtime/__driver__.lua
        tests/undrop/__driver__.lua unix/parse_time.cc
        win32/parse_time.cc
Added directories:
        policies tests/bad_and_unknown_certs
        tests/branch_leaves_sync_bug tests/catch_lua_output
        tests/cert_no_branch tests/changelog_editor
        tests/db_check_branch_leaves tests/disapproving_a_non_head
        tests/keep_valid_workspace_options_on_error
        tests/log_recognizes_invalid_workspace_parent
        tests/log_with_windows_dirsep tests/merge_--update
        tests/netsync_per_server_defaults tests/policy-basic
        tests/policy-keys tests/policy-netsync
        tests/policy-subpolicies tests/policy-tags
        tests/setup_and_clone_keep_bookkeeping_dir
        tests/setup_creates_internal_db
        tests/unchanged_options_preserves_mtime tests/undrop
Modified files:
        INSTALL Makefile.am NEWS asciik.cc automate.cc
        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
        contrib/edit_comment_from_changelog.lua database.cc
        database.hh database_check.cc dates.cc dates.hh
        enumerator.cc enumerator.hh epoch.cc epoch.hh file_io.hh
        key_store.cc keys.cc keys.hh lua_hooks.cc lua_hooks.hh
        luaext_platform.cc migrate_ancestry.cc monotone.cc
        monotone.texi network/automate_session.cc
        network/netsync_session.cc network/netsync_session.hh
        network/session.cc options.hh options_list.hh origin_type.hh
        outdated_indicator.cc outdated_indicator.hh packet.cc
        paths.hh platform.hh po/de.po po/es.po po/fr.po po/it.po
        po/ja.po po/pt.po po/pt_BR.po po/sv.po project.cc project.hh
        restrictions.cc restrictions.hh sanity.cc sanity.hh
        selectors.cc simplestring_xform.cc simplestring_xform.hh
        std_hooks.lua tester.cc
        tests/_--author,_--date/__driver__.lua
        tests/_--rcfile=-/__driver__.lua
        tests/_--rcfile=directory/aaa.rc
        tests/_--rcfile=directory/aba.rc
        tests/_--rcfile=directory/bbb.rc
        
tests/_MTN_files_handled_correctly_in_aborted_commit/bad_edit_comment.lua
        tests/attr_command_in_subdirs/__driver__.lua
        tests/attr_set_get_commands/__driver__.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/change_workspace/__driver__.lua
        tests/checkout_creates__MTN_log/commit_log.lua
        tests/clone_creates__MTN_log/commit_log.lua
        tests/commit_default_editor/__driver__.lua
        tests/commit_default_editor/test_hooks.lua
        tests/commit_using__MTN_log/__driver__.lua
        tests/commit_using__MTN_log/commit_cancelled.lua
        tests/commit_using__MTN_log/commit_confirmed.lua
        tests/commit_using__MTN_log_and_--message/commit_log.lua
        tests/commit_validation_lua_hook/errmsg
        tests/commit_with_--message-file/commit_log.lua
        tests/commit_writes_message_back_to__MTN_log/__driver__.lua
        tests/commit_writes_message_back_to__MTN_log/my_hook.lua
        tests/common/netsync-hooks.lua
        tests/db_check_and_non-serious_errors/__driver__.lua
        tests/db_kill_tag_locally/__driver__.lua
        tests/diff_--external/__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/empty_environment/__driver__.lua
        tests/fetching_nonexistent_entry_from_children_bug/__driver__.lua
        tests/git_export/__driver__.lua
        tests/i18n_commit_messages/__driver__.lua
        tests/i18n_commit_messages/euc-jp.txt
        tests/i18n_commit_messages/extra_hooks.lua
        tests/i18n_commit_messages/utf8.txt
        tests/importing_cvs_metadata/expected_log_output
        tests/importing_cvs_tricky_repo_with_tags/test.tags
        
tests/include()_includedir()_and_includedirpattern()_lua_functions/aaa.rc
        
tests/include()_includedir()_and_includedirpattern()_lua_functions/aba.rc
        
tests/include()_includedir()_and_includedirpattern()_lua_functions/bbb.zz
        tests/log_dir/__driver__.lua
        tests/log_with_restriction/__driver__.lua
        tests/ls_tags_with_ambiguous_tags/__driver__.lua
        tests/lua_function_existsonpath/__driver__.lua
        tests/manifest_restrictions/__driver__.lua
        tests/merge_into_workspace/__driver__.lua
        tests/merge_into_workspace/expected-log
        tests/merge_into_workspace/expected-log-left
        tests/merge_update_part_of_file/__driver__.lua
        tests/netsync_default_server_pattern/__driver__.lua
        tests/policy-tags/__driver__.lua
        tests/resolve_conflicts_all_resolutions/__driver__.lua
        tests/resolve_conflicts_all_resolutions/merge-1
        tests/resolve_conflicts_content/merge-1
        tests/resolve_conflicts_duplicate_name/merge-1
        tests/resolve_conflicts_none/merge-1
        tests/resolve_conflicts_propagate/propagate-1
        tests/resolve_conflicts_propagate/propagate-2
        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/serve-automate/__driver__.lua
        tests/serve-automate-single-run/__driver__.lua
        tests/status/__driver__.lua
        tests/subdirectory_restrictions/__driver__.lua
        tests/suspend/__driver__.lua
        tests/tags_and_tagging_of_revisions/__driver__.lua
        tests/use_restrictions_with_--exclude/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc transforms.hh
        unit-tests/dates.cc unit-tests/restrictions.cc
        unit-tests/simplestring_xform.cc vocab_terms.hh
        win32/main.cc work.cc work.hh

ChangeLog: 

Merge in mainline changes.


monotone --db={your.database} diff 
--revision=0974195ed088d0bb1354185a79810324c21f01bf 
--revision=46320bb52564bc1bb3c95a6a6fcfeb7feafe98fe
monotone --db={your.database} diff 
--revision=4bee0e0964af5c65d8cabf9c3f81eec0a55213ac 
--revision=46320bb52564bc1bb3c95a6a6fcfeb7feafe98fe
----------------------------------------------------------------------