[Monotone-commits-diffs] Revision 8cd9e68550663519d302fe19231eda088de8a053

[monotone]

-----------------------------------------------------------------
Revision: 8cd9e68550663519d302fe19231eda088de8a053
Ancestor: 059305f5555b753ba5d731f2edc8451d490ef047
Ancestor: 1a8afa25119c9c88dfd031c7fd834f6f99507ecf
Author: Timothy Brownawell  <address@hidden>
Date: 1969-12-21T00:53:42
Branch: net.venge.monotone.tbrownaw.policy-branches

Added files:
        branch_name.cc branch_name.hh cmd_policy.cc
        editable_policy.cc editable_policy.hh policy.cc policy.hh
        tests/noop_merge_into_workspace/__driver__.lua
        tests/policy-basic/__driver__.lua
        tests/policy-netsync/__driver__.lua
        tests/policy-subpolicies/__driver__.lua
        tests/policy-tags/__driver__.lua
Added directories:
        tests/noop_merge_into_workspace tests/policy-basic
        tests/policy-netsync tests/policy-subpolicies
        tests/policy-tags
Modified files:
        INSTALL Makefile.am NEWS asciik.cc automate.cc cert.cc
        cert.hh cmd_automate.cc cmd_conflicts.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_ws_commit.cc database.cc database.hh dates.cc dates.hh
        enumerator.cc enumerator.hh epoch.cc epoch.hh gettext.h
        lua_hooks.cc lua_hooks.hh luaext_platform.cc monotone.cc
        monotone.texi netsync.cc options.hh options_list.hh po/de.po
        project.cc project.hh rcs_import.cc revision.cc roster.cc
        roster_merge.cc selectors.cc std_hooks.lua tester.cc
        tests/automate_stdio/__driver__.lua
        tests/netsync_permissions/__driver__.lua vocab_terms.hh

ChangeLog: 

Merge in mainline changes.


monotone --db={your.database} diff 
--revision=059305f5555b753ba5d731f2edc8451d490ef047 
--revision=8cd9e68550663519d302fe19231eda088de8a053
monotone --db={your.database} diff 
--revision=1a8afa25119c9c88dfd031c7fd834f6f99507ecf 
--revision=8cd9e68550663519d302fe19231eda088de8a053
----------------------------------------------------------------------