[Monotone-commits-diffs] Revision a072ad550c0ddb335e009413b097465d6a957b31

[monotone]

-----------------------------------------------------------------
Revision: a072ad550c0ddb335e009413b097465d6a957b31
Ancestor: 6a9e9f685043518eb86d0c136294df660c88efaa
Ancestor: ff1aead2f2c74f7316b66c4b090d529641c4d5c1
Author: Timothy Brownawell  <address@hidden>
Date: 2010-06-03 01.18.54
Branch: net.venge.monotone.tbrownaw.policy-branches

Renamed entries:
        win32/monotone.iss to win32/monotone.iss.in
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/diff_patch_add/__driver__.lua
        tests/diff_patch_drop/__driver__.lua
        tests/diff_patch_rename/__driver__.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 win32/dlls.sh
Added directories:
        policies tests/diff_patch_add tests/diff_patch_drop
        tests/diff_patch_rename 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 configure.ac 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 netxx_pipe.cc
        notes/release-checklist.txt options.hh options_list.hh
        origin_type.hh outdated_indicator.cc outdated_indicator.hh
        po/de.po project.cc project.hh rev_output.cc sanity.cc
        sanity.hh selectors.cc std_hooks.lua tester.cc
        tests/diff_restriction_renamed_parent/__driver__.lua
        tests/diff_shows_renames/__driver__.lua
        tests/diffing_a_revision_with_an_added_file/__driver__.lua
        tests/log_--diffs/__driver__.lua
        tests/log_--diffs/expect_full
        tests/log_--diffs/expect_restrict
        tests/restricted_diff_file_in_renamed_dir/__driver__.lua
        transforms.hh vocab_terms.hh win32/README
        win32/monotone.iss.in win32/process.cc

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=6a9e9f685043518eb86d0c136294df660c88efaa 
--revision=a072ad550c0ddb335e009413b097465d6a957b31
monotone --db={your.database} diff 
--revision=ff1aead2f2c74f7316b66c4b090d529641c4d5c1 
--revision=a072ad550c0ddb335e009413b097465d6a957b31
----------------------------------------------------------------------