[Monotone-commits-nodiffs] Revision 9ab92033aee8d27680e7234280719e168913b70e

[monotone]

-----------------------------------------------------------------
Revision: 9ab92033aee8d27680e7234280719e168913b70e
Ancestor: 524c3fdc17913f3289aad753e5d2363b758493d6
Ancestor: 942552bfbffd78d1e039c1bda84a2c896f6916e6
Author: Timothy Brownawell  <address@hidden>
Date: 2008-12-17T01:02:42
Branch: net.venge.monotone.tbrownaw.policy-branches

Renamed entries:
        tests/--no-workspace to tests/_--no-workspace
        tests/resolve_duplicate_name_conflict to 
tests/resolve_conflicts_duplicate_name
Added files:
        branch_name.cc branch_name.hh cmd_conflicts.cc cmd_policy.cc
        editable_policy.cc editable_policy.hh policy.cc policy.hh
        tests/automate_file_merge/__driver__.lua
        tests/automate_lua/__driver__.lua
        tests/automate_lua/test.lua
        tests/automate_read_packets/__driver__.lua
        tests/invalid__MTN_options/__driver__.lua
        tests/policy-basic/__driver__.lua
        tests/policy-netsync/__driver__.lua
        tests/policy-subpolicies/__driver__.lua
        tests/policy-tags/__driver__.lua
        tests/resolve_conflicts_all_merge_commands/__driver__.lua
        tests/resolve_conflicts_all_resolutions/__driver__.lua
        tests/resolve_conflicts_all_resolutions/conflicts-1
        tests/resolve_conflicts_all_resolutions/conflicts-resolved
        tests/resolve_conflicts_all_resolutions/merge-1
        tests/resolve_conflicts_all_resolutions/merge3_hook.lua
        tests/resolve_conflicts_all_resolutions/show_first-checkout_left
        tests/resolve_conflicts_all_resolutions/show_first-checkout_right
        tests/resolve_conflicts_all_resolutions/show_first-interactive
        tests/resolve_conflicts_all_resolutions/show_first-thermostat
        tests/resolve_conflicts_all_resolutions/show_first-user
        tests/resolve_conflicts_all_resolutions/show_remaining-checkout_left
        tests/resolve_conflicts_all_resolutions/show_remaining-thermostat
        tests/resolve_conflicts_content/__driver__.lua
        tests/resolve_conflicts_content/conflicts-1
        tests/resolve_conflicts_content/conflicts-2
        tests/resolve_conflicts_content/merge-1
        tests/resolve_conflicts_content/update-1
        tests/resolve_conflicts_duplicate_name/conflicts-1
        tests/resolve_conflicts_duplicate_name/conflicts-resolved
        tests/resolve_conflicts_duplicate_name/merge-1
        tests/resolve_conflicts_errors/__driver__.lua
        tests/resolve_conflicts_errors/conflicts-attr-show-1
        tests/resolve_conflicts_errors/conflicts-attr-show-2
        tests/resolve_conflicts_errors/conflicts-attr-store-1
        tests/resolve_conflicts_errors/conflicts-attr-store-2
        tests/resolve_conflicts_errors/merge-old-conflicts-file
        tests/resolve_conflicts_multiple_names/__driver__.lua
        tests/resolve_conflicts_none/__driver__.lua
        tests/resolve_conflicts_none/conflicts-1
        tests/resolve_conflicts_none/merge-1
        tests/resolve_conflicts_none/update-1
        tests/resolve_conflicts_propagate/__driver__.lua
        tests/resolve_conflicts_propagate/conflicts-1
        tests/resolve_conflicts_propagate/conflicts-2
        tests/resolve_conflicts_propagate/conflicts-resolved
        tests/resolve_conflicts_propagate/propagate-1
        tests/resolve_conflicts_propagate/propagate-2
        tests/resolve_conflicts_read_all/__driver__.lua
        tests/resolve_conflicts_read_all/attribute-attached_left
        tests/resolve_conflicts_read_all/attribute-attached_right
        tests/resolve_conflicts_read_all/attribute-detached_left
        tests/resolve_conflicts_read_all/attribute-detached_right
        tests/resolve_conflicts_read_all/content-attached_left
        tests/resolve_conflicts_read_all/content-attached_right
        tests/resolve_conflicts_read_all/content-detached_left
        tests/resolve_conflicts_read_all/content-detached_right
        tests/resolve_conflicts_read_all/directory-loop_left
        tests/resolve_conflicts_read_all/directory-loop_right
        tests/resolve_conflicts_read_all/duplicate-add-rename_left
        tests/resolve_conflicts_read_all/duplicate-add-rename_right
        tests/resolve_conflicts_read_all/duplicate-adds_left
        tests/resolve_conflicts_read_all/duplicate-adds_right
        
tests/resolve_conflicts_read_all/duplicate-name-multiple-name-missing-root_left
        
tests/resolve_conflicts_read_all/duplicate-name-multiple-name-missing-root_right
        tests/resolve_conflicts_read_all/duplicate-renames_left
        tests/resolve_conflicts_read_all/duplicate-renames_right
        tests/resolve_conflicts_read_all/invalid-add_left
        tests/resolve_conflicts_read_all/invalid-add_right
        tests/resolve_conflicts_read_all/invalid-rename_left
        tests/resolve_conflicts_read_all/invalid-rename_right
        tests/resolve_conflicts_read_all/missing-root_left
        tests/resolve_conflicts_read_all/missing-root_right
        tests/resolve_conflicts_read_all/multiple-name-plus-directory-loop_left
        tests/resolve_conflicts_read_all/multiple-name-plus-directory-loop_right
        tests/resolve_conflicts_read_all/multiple-name-plus-duplicate-name_left
        tests/resolve_conflicts_read_all/multiple-name-plus-duplicate-name_right
        tests/resolve_conflicts_read_all/multiple-name-plus-orphan_left
        tests/resolve_conflicts_read_all/multiple-name-plus-orphan_right
        tests/resolve_conflicts_read_all/multiple-names_left
        tests/resolve_conflicts_read_all/multiple-names_right
        tests/resolve_conflicts_read_all/orphaned-add_left
        tests/resolve_conflicts_read_all/orphaned-add_right
        tests/resolve_conflicts_read_all/orphaned-rename_left
        tests/resolve_conflicts_read_all/orphaned-rename_right
        tests/resolve_conflicts_read_all/unrelated-projects_left
        tests/resolve_conflicts_read_all/unrelated-projects_right
Added directories:
        tests/automate_file_merge tests/automate_lua
        tests/automate_read_packets tests/invalid__MTN_options
        tests/policy-basic tests/policy-netsync
        tests/policy-subpolicies tests/policy-tags
        tests/resolve_conflicts_all_merge_commands
        tests/resolve_conflicts_all_resolutions
        tests/resolve_conflicts_content
        tests/resolve_conflicts_errors
        tests/resolve_conflicts_multiple_names
        tests/resolve_conflicts_none
        tests/resolve_conflicts_propagate
        tests/resolve_conflicts_read_all
Modified files:
        AUTHORS Makefile.am NEWS asciik.cc automate.cc basic_io.cc
        basic_io.hh cert.cc cert.hh cmd.hh 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_ws_commit.cc commands.cc database.cc database.hh
        diff_patch.cc diff_patch.hh enumerator.cc enumerator.hh
        epoch.cc epoch.hh globish.cc globish.hh gzip.cc gzip.hh
        key_store.cc lua/luaconf.h lua.cc lua.hh lua_hooks.cc
        lua_hooks.hh luaext_platform.cc merge.cc merge.hh
        merkle_tree.cc monotone.texi netcmd.cc netio.hh netsync.cc
        options.hh options_list.hh paths.cc paths.hh po/LINGUAS
        po/POTFILES.in po/de.po po/es.po project.cc project.hh
        revision.cc revision.hh roster.cc roster.hh roster_merge.cc
        roster_merge.hh sanity.hh selectors.cc std_hooks.lua
        tester.cc testlib.lua
        tests/automate_content_diff/__driver__.lua
        tests/automate_show_conflicts/__driver__.lua
        tests/automate_show_conflicts/expected-content-attached.stdout
        tests/automate_show_conflicts/expected-directory-loop.stdout
        tests/empty_string_as_a_path_name/__driver__.lua
        tests/resolve_conflicts_duplicate_name/__driver__.lua
        tests/schema_migration_with_rosterify/__driver__.lua
        transforms.hh vocab.cc vocab.hh vocab_macros.hh
        vocab_terms.hh work.cc
Modified attrs:
        tests/resolve_conflicts_errors/__driver__.lua
        tests/resolve_conflicts_errors/conflicts-attr-store-1

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
524c3fdc17913f3289aad753e5d2363b758493d6)
            to branch 'net.venge.monotone.tbrownaw.policy-branches' (head 
942552bfbffd78d1e039c1bda84a2c896f6916e6)


monotone --db={your.database} diff 
--revision=524c3fdc17913f3289aad753e5d2363b758493d6 
--revision=9ab92033aee8d27680e7234280719e168913b70e
monotone --db={your.database} diff 
--revision=942552bfbffd78d1e039c1bda84a2c896f6916e6 
--revision=9ab92033aee8d27680e7234280719e168913b70e
----------------------------------------------------------------------