[Monotone-commits-diffs] Revision 2810572fccdb6694cda706a2349a7104382d0a1c

[monotone]

-----------------------------------------------------------------
Revision: 2810572fccdb6694cda706a2349a7104382d0a1c
Ancestor: 41570dec8cdbd7450f10b95bd2fedf65fa2ed2be
Ancestor: 55f13aaf66a6f60da9fdfff180d5bdea08400383
Author: Timothy Brownawell  <address@hidden>
Date: 08/15/10 02:43:34
Branch: net.venge.monotone.tbrownaw.policy-branches

Added files:
        automate_stdio_helpers.hh branch_name.cc branch_name.hh
        cmd_policy.cc date_format.hh option_reset_info.hh
        options_applicator.cc options_applicator.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/cancelled_arguments/__driver__.lua
        tests/complete_option_names/__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
Added directories:
        policies tests/cancelled_arguments
        tests/complete_option_names tests/policy-basic
        tests/policy-keys tests/policy-netsync
        tests/policy-subpolicies tests/policy-tags
Modified files:
        Makefile.am NEWS annotate.cc app_state.hh asciik.cc
        automate.cc base.hh cmd.cc 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_packet.cc
        cmd_ws_commit.cc commands.cc commands.hh constants.hh
        contrib/monoprof.sh contrib/monotone-notify-hookversion.lua
        contrib/monotone.bash_completion
        contrib/monotone.zsh_completion database.cc database.hh
        enumerator.cc enumerator.hh epoch.cc epoch.hh key_store.cc
        keys.cc lua-testsuite.lua lua_hooks.cc lua_hooks.hh
        luaext_platform.cc m4/numeric_vocab.m4
        maybe_workspace_updater.cc merge_conflict.cc
        migrate_ancestry.cc monotone.cc monotone.texi netsync.cc
        network/automate_session.cc network/connection_info.cc
        network/connection_info.hh network/listener.cc
        network/listener.hh network/make_server.cc
        network/make_server.hh network/netsync_session.cc
        network/netsync_session.hh network/session.cc option.cc
        option.hh options.cc options.hh options_list.hh
        origin_type.hh project.cc project.hh sanity.cc sanity.hh
        selectors.cc std_hooks.lua tester.cc
        tests/basic_invocation_and_options/__driver__.lua
        tests/commit_use_workspace_keydir/__driver__.lua
        tests/creating_a_bad_criss-cross_merge/__driver__.lua
        tests/date_formatting/__driver__.lua
        tests/default_command_options/__driver__.lua
        tests/default_command_options/default_options.lua
        tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/netsync_negotiation/__driver__.lua
        tests/non_workspace_keydir/__driver__.lua
        tests/reallyquiet_turns_off_tickers_and_warnings/__driver__.lua
        tests/short_options_work_correctly/__driver__.lua
        tests/ssh_agent/__driver__.lua
        tests/subdirectory_restrictions/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc
        tests/verification_of_command_line_options/__driver__.lua
        transforms.hh ui.cc ui.hh unix/main.cc vocab_terms.hh
        win32/main.cc work.cc

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=41570dec8cdbd7450f10b95bd2fedf65fa2ed2be 
--revision=2810572fccdb6694cda706a2349a7104382d0a1c
monotone --db={your.database} diff 
--revision=55f13aaf66a6f60da9fdfff180d5bdea08400383 
--revision=2810572fccdb6694cda706a2349a7104382d0a1c
----------------------------------------------------------------------