[Monotone-commits-diffs] Revision 8732f1091309b094cc986a7479552d53423dee27

[monotone]

-----------------------------------------------------------------
Revision: 8732f1091309b094cc986a7479552d53423dee27
Ancestor: 06a9ca6ce12f73634c505f826c8363f3bf3033d0
Ancestor: 1ed7b2993e468a15c225ff8466dfc0b8da27f069
Author: Timothy Brownawell  <address@hidden>
Date: 2010-06-03 22.20.51
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:
        HACKING Makefile.am NEWS asciik.cc automate.cc cmd.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
        dates.cc 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 project.cc project.hh sanity.cc sanity.hh
        selectors.cc std_hooks.lua tester.cc
        tests/branch_leaves_sync_bug/__driver__.lua transforms.hh
        unix/parse_time.cc vocab_terms.hh win32/parse_time.cc

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=06a9ca6ce12f73634c505f826c8363f3bf3033d0 
--revision=8732f1091309b094cc986a7479552d53423dee27
monotone --db={your.database} diff 
--revision=1ed7b2993e468a15c225ff8466dfc0b8da27f069 
--revision=8732f1091309b094cc986a7479552d53423dee27
----------------------------------------------------------------------