[Monotone-commits-diffs] Revision 2b443302f03262023eeb90ecbe8c8ba19d9b8784

[monotone]

-----------------------------------------------------------------
Revision: 2b443302f03262023eeb90ecbe8c8ba19d9b8784
Ancestor: 974f2022e047914d3e9460b66e743dd657660549
Ancestor: aa6f2b85ff2a99fa7060f7ea7bb0d0e0a924bc00
Author: Timothy Brownawell  <address@hidden>
Date: 2010-06-03 04.21.09
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
Added directories:
        policies tests/policy-basic tests/policy-keys
        tests/policy-netsync tests/policy-subpolicies
        tests/policy-tags
Modified files:
        Makefile.am NEWS asciik.cc 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 keys.cc lua_hooks.cc
        lua_hooks.hh luaext_platform.cc migrate_ancestry.cc
        monotone.texi network/netsync_session.cc
        network/netsync_session.hh network/session.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/log_--diffs/__driver__.lua
        tests/log_--diffs/expect_restrict transforms.hh
        vocab_terms.hh

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=974f2022e047914d3e9460b66e743dd657660549 
--revision=2b443302f03262023eeb90ecbe8c8ba19d9b8784
monotone --db={your.database} diff 
--revision=aa6f2b85ff2a99fa7060f7ea7bb0d0e0a924bc00 
--revision=2b443302f03262023eeb90ecbe8c8ba19d9b8784
----------------------------------------------------------------------