[Monotone-commits-nodiffs] Revision ad25b79088f43d69c2d7dcf0d6a86864aa4e60af

[monotone]

-----------------------------------------------------------------
Revision: ad25b79088f43d69c2d7dcf0d6a86864aa4e60af
Ancestor: ac3eb05298500161c14e5cc9f519137a2b8b3232
Ancestor: d4767d367f1d24734258c5c904fcc4bdd0851703
Author: Timothy Brownawell  <address@hidden>
Date: 08/09/10 05:00:53
Branch: net.venge.monotone.tbrownaw.policy-branches

Deleted entries:
        tests/db_kill_branch_certs_locally_command
        tests/db_kill_branch_certs_locally_command/__driver__.lua
        tests/db_kill_tag_locally
        tests/db_kill_tag_locally/__driver__.lua
Renamed entries:
        tests/commit_validation_lua_hook to tests/validate_commit_message_hook
Added files:
        branch_name.cc branch_name.hh cmd_policy.cc netsync.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
        tests/annotate_ignores_untrusted_certs/__driver__.lua
        tests/annotate_ignores_untrusted_certs/all_untrusted.lua
        tests/annotate_ignores_untrusted_certs/author_untrusted.lua
        tests/annotate_ignores_untrusted_certs/date_untrusted.lua
        tests/automate_log/__driver__.lua
        tests/clone_aborts_on_branch_pattern_in_uri/__driver__.lua
        tests/db_kill_certs_locally/__driver__.lua
        tests/disapproving_of_a_merge_revision/__driver__.lua
        tests/disapproving_of_a_merge_revision/badfile
        tests/disapproving_of_a_merge_revision/badfile2
        tests/disapproving_of_a_merge_revision/goodfile
        tests/disapproving_of_a_merge_revision/rootfile
        tests/disapproving_of_a_revision_range/__driver__.lua
        tests/disapproving_of_a_revision_range/badfile
        tests/disapproving_of_a_revision_range/badfile2
        tests/disapproving_of_a_revision_range/finalfile
        tests/disapproving_of_a_revision_range/goodfile
        tests/disapproving_of_a_revision_range/rootfile
        tests/disapproving_of_a_revision_range/updatefile
        tests/disapproving_of_bad_revision_range/__driver__.lua
        tests/extended-selectors/__driver__.lua
        tests/k_selector/__driver__.lua tests/k_selector/rcfile
        tests/key_files_deleted_securely/__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/rename_warns_on_subdir_move/__driver__.lua
        tests/status_with_no_key/__driver__.lua
        tests/trust_hooks_and_trusted_command/hooks.lua
        tests/update_does_not_suggest_suspended_branches/__driver__.lua
        tests/validate_changes_hook/__driver__.lua
        tests/validate_changes_hook/commit_validate.lua
        tests/validate_changes_hook/errmsg
        tests/warn_on_weird_branch_names/__driver__.lua
Added directories:
        policies tests/annotate_ignores_untrusted_certs
        tests/automate_log
        tests/clone_aborts_on_branch_pattern_in_uri
        tests/db_kill_certs_locally
        tests/disapproving_of_a_merge_revision
        tests/disapproving_of_a_revision_range
        tests/disapproving_of_bad_revision_range
        tests/extended-selectors tests/k_selector
        tests/key_files_deleted_securely tests/policy-basic
        tests/policy-keys tests/policy-netsync
        tests/policy-subpolicies tests/policy-tags
        tests/rename_warns_on_subdir_move tests/status_with_no_key
        tests/update_does_not_suggest_suspended_branches
        tests/validate_changes_hook tests/warn_on_weird_branch_names
Modified files:
        INSTALL Makefile.am NEWS UPGRADE annotate.cc asciik.cc
        automate.cc base.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_packet.cc
        cmd_policy.cc cmd_ws_commit.cc configure.ac
        contrib/mtn_makepermissions database.cc database.hh
        diff_output.cc enumerator.cc enumerator.hh epoch.cc epoch.hh
        globish.cc globish.hh key_store.cc keys.cc keys.hh
        lua-testsuite.lua lua_hooks.cc lua_hooks.hh
        luaext_platform.cc merge_conflict.cc migrate_ancestry.cc
        monotone.texi netcmd.cc netcmd.hh netsync.cc
        network/connection_info.cc network/connection_info.hh
        network/netsync_session.cc network/netsync_session.hh
        network/wrapped_session.cc network/wrapped_session.hh
        notes/release-checklist.txt options.hh options_list.hh
        origin_type.hh paths.cc paths.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 roster.cc
        roster.hh sanity.cc sanity.hh selectors.cc selectors.hh
        std_hooks.lua tester.cc testlib.lua
        tests/attr_mtn_execute/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected.stderr
        tests/automate_inventory_ignore_dirs/expected_2.stderr
        tests/branch_leaves_sync_bug/__driver__.lua
        tests/cert_no_branch/__driver__.lua
        tests/changelog_editor/__driver__.lua
        tests/changelog_editor/changelog.lua
        tests/clone_branch_no_dir/__driver__.lua
        tests/clone_creates__MTN_log/__driver__.lua
        tests/clone_creates_right__MTN_options/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/clone_warning_with_multiple_heads/__driver__.lua
        tests/common/automate_ancestry.lua
        tests/common/automate_stdio.lua tests/common/netsync.lua
        tests/db_kill_rev_locally/__driver__.lua
        tests/db_kill_rev_locally_and_recommit/__driver__.lua
        tests/db_kill_rev_locally_workspace/__driver__.lua
        tests/diff_patch_drop/__driver__.lua
        tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/fail_cleanly_on_unreadable_db/__driver__.lua
        tests/imp_test_filesync_confdir/__driver__.lua
        tests/import/__driver__.lua tests/log_dir/__driver__.lua
        tests/log_with_restriction/__driver__.lua
        tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/netsync_default_server_pattern/__driver__.lua
        tests/netsync_mtn_uri_scheme/__driver__.lua
        tests/netsync_over_pipes/__driver__.lua
        tests/netsync_verifies_server_keys/__driver__.lua
        tests/renaming_a_directory/__driver__.lua
        tests/resolve_conflicts_all_merge_commands/__driver__.lua
        tests/resolve_conflicts_errors/__driver__.lua
        tests/restriction_includes_parent_dir/__driver__.lua
        tests/serve-automate/__driver__.lua
        tests/serve-automate-single-run/__driver__.lua
        tests/test_hooks.lua
        tests/trust_hooks_and_trusted_command/__driver__.lua
        tests/update_ignores_suspended_heads/__driver__.lua
        tests/update_to_off-branch_rev/__driver__.lua texinfo.css
        transforms.hh unit-tests/dates.cc unit-tests/roster.cc
        update.cc update.hh uri.cc uri.hh visualc/config.h vocab.hh
        vocab_terms.hh win32/parse_date.cc work.cc

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=ac3eb05298500161c14e5cc9f519137a2b8b3232 
--revision=ad25b79088f43d69c2d7dcf0d6a86864aa4e60af
monotone --db={your.database} diff 
--revision=d4767d367f1d24734258c5c904fcc4bdd0851703 
--revision=ad25b79088f43d69c2d7dcf0d6a86864aa4e60af
----------------------------------------------------------------------