[Monotone-commits-diffs] Revision 20d54c174c8ce461060ca965f62365b69d124767

[monotone]

-----------------------------------------------------------------
Revision: 20d54c174c8ce461060ca965f62365b69d124767
Ancestor: 46320bb52564bc1bb3c95a6a6fcfeb7feafe98fe
Ancestor: 5b755f8596f3f9d6df1ea6d9e7095f030d21edcb
Author: Timothy Brownawell  <address@hidden>
Date: 2010-05-28 04.07.33
Branch: net.venge.monotone.tbrownaw.policy-branches

Renamed entries:
        tests/setup_creates_internal_db to tests/setup_creates_default_db
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/add,remove,cleanup_registered_workspaces/__driver__.lua
        tests/database_aliases/__driver__.lua
        tests/database_aliases/rcfile.lua
        tests/list_databases/__driver__.lua
        tests/list_databases/rcfile.lua
        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/setup_creates_default_db/rcfile.lua
        tests/update_ignores_suspended_heads/__driver__.lua
Added directories:
        policies tests/add,remove,cleanup_registered_workspaces
        tests/database_aliases tests/list_databases
        tests/policy-basic tests/policy-keys tests/policy-netsync
        tests/policy-subpolicies tests/policy-tags
        tests/update_ignores_suspended_heads
Modified files:
        Makefile.am NEWS app_state.cc app_state.hh 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_policy.cc
        cmd_ws_commit.cc database.cc database.hh enumerator.cc
        enumerator.hh epoch.cc epoch.hh key_store.cc keys.cc
        lazy_rng.hh lua_hooks.cc lua_hooks.hh luaext_platform.cc
        migrate_ancestry.cc monotone.cc monotone.texi
        network/automate_session.cc network/netsync_session.cc
        network/netsync_session.hh network/session.cc options.hh
        options_list.hh origin_type.hh outdated_indicator.cc
        outdated_indicator.hh paths.cc paths.hh po/de.po
        policies/branch.cc policies/branch.hh policies/delegation.cc
        policies/delegation.hh project.cc project.hh sanity.cc
        sanity.hh selectors.cc std_hooks.lua tester.cc
        tests/attr_mtn_execute/__driver__.lua
        tests/clone_branch_no_dir/__driver__.lua
        tests/clone_creates__MTN_log/__driver__.lua
        tests/clone_creates_right__MTN_options/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/clone_warning_with_multiple_heads/__driver__.lua
        tests/setup_creates_default_db/__driver__.lua
        tests/vars/__driver__.lua transforms.hh vocab.hh
        vocab_terms.hh work.cc work.hh

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=46320bb52564bc1bb3c95a6a6fcfeb7feafe98fe 
--revision=20d54c174c8ce461060ca965f62365b69d124767
monotone --db={your.database} diff 
--revision=5b755f8596f3f9d6df1ea6d9e7095f030d21edcb 
--revision=20d54c174c8ce461060ca965f62365b69d124767
----------------------------------------------------------------------