[Monotone-commits-diffs] Revision 41570dec8cdbd7450f10b95bd2fedf65fa2ed2be

[monotone]

-----------------------------------------------------------------
Revision: 41570dec8cdbd7450f10b95bd2fedf65fa2ed2be
Ancestor: ad25b79088f43d69c2d7dcf0d6a86864aa4e60af
Ancestor: cf0c68b20c64390bc4f2160530d69cb63f401316
Author: Timothy Brownawell  <address@hidden>
Date: 08/09/10 14:25:05
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
        network/netsync_session.cc network/netsync_session.hh
        options.hh options_list.hh origin_type.hh packet.cc
        project.cc project.hh sanity.cc sanity.hh selectors.cc
        std_hooks.lua tester.cc
        tests/key_files_deleted_securely/__driver__.lua
        tests/serve-automate/__driver__.lua
        tests/serve-automate-single-run/__driver__.lua
        tests/validate_changes_hook/__driver__.lua
        tests/validate_changes_hook/commit_validate.lua
        transforms.hh unit-tests/packet.cc vocab_terms.hh

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=ad25b79088f43d69c2d7dcf0d6a86864aa4e60af 
--revision=41570dec8cdbd7450f10b95bd2fedf65fa2ed2be
monotone --db={your.database} diff 
--revision=cf0c68b20c64390bc4f2160530d69cb63f401316 
--revision=41570dec8cdbd7450f10b95bd2fedf65fa2ed2be
----------------------------------------------------------------------