[Monotone-commits-diffs] Revision 97073faf09d3f72722d9b5b9c46cae129b50473e

[monotone]

-----------------------------------------------------------------
Revision: 97073faf09d3f72722d9b5b9c46cae129b50473e
Ancestor: 2810572fccdb6694cda706a2349a7104382d0a1c
Ancestor: b02e72460bf73a872840d16c1b347c8c831043f0
Author: Timothy Brownawell  <address@hidden>
Date: 08/15/10 05:32:15
Branch: net.venge.monotone.tbrownaw.policy-branches

Added files:
        branch_name.cc branch_name.hh cmd_policy.cc
        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/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/verbosity/__driver__.lua
Added directories:
        policies tests/policy-basic tests/policy-keys
        tests/policy-netsync tests/policy-subpolicies
        tests/policy-tags tests/verbosity
Modified files:
        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 database.cc database.hh
        enumerator.cc enumerator.hh epoch.cc epoch.hh lua_hooks.cc
        lua_hooks.hh luaext_platform.cc migrate_ancestry.cc
        monotone.cc network/netsync_session.cc
        network/netsync_session.hh options.hh options_applicator.cc
        options_list.hh origin_type.hh project.cc project.hh
        sanity.cc sanity.hh selectors.cc std_hooks.lua tester.cc
        tests/common/automate_stdio.lua
        tests/reallyquiet_turns_off_tickers_and_warnings/__driver__.lua
        transforms.hh vocab_terms.hh

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=2810572fccdb6694cda706a2349a7104382d0a1c 
--revision=97073faf09d3f72722d9b5b9c46cae129b50473e
monotone --db={your.database} diff 
--revision=b02e72460bf73a872840d16c1b347c8c831043f0 
--revision=97073faf09d3f72722d9b5b9c46cae129b50473e
----------------------------------------------------------------------