[Monotone-commits-diffs] Revision ac3eb05298500161c14e5cc9f519137a2b8b3232

[monotone]

-----------------------------------------------------------------
Revision: ac3eb05298500161c14e5cc9f519137a2b8b3232
Ancestor: 135daf2a16c656018ee6f3e60fd13544f4ac751b
Ancestor: 8732f1091309b094cc986a7479552d53423dee27
Author: Timothy Brownawell  <address@hidden>
Date: 2010-06-10 07.04.41
Branch: net.venge.monotone.tbrownaw.policy-branches

Renamed entries:
        unix/parse_time.cc to unix/parse_date.cc
        win32/parse_time.cc to win32/parse_date.cc
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 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 platform.hh po/it.po po/pt.po project.cc
        project.hh sanity.cc sanity.hh selectors.cc std_hooks.lua
        tester.cc transforms.hh unit-tests/dates.cc
        unix/parse_date.cc vocab_terms.hh win32/parse_date.cc

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=135daf2a16c656018ee6f3e60fd13544f4ac751b 
--revision=ac3eb05298500161c14e5cc9f519137a2b8b3232
monotone --db={your.database} diff 
--revision=8732f1091309b094cc986a7479552d53423dee27 
--revision=ac3eb05298500161c14e5cc9f519137a2b8b3232
----------------------------------------------------------------------