[Monotone-commits-diffs] Revision 40dd888f750771fe6042982debd3213694c4c1ca

[monotone]

-----------------------------------------------------------------
Revision: 40dd888f750771fe6042982debd3213694c4c1ca
Ancestor: 10a6963129c0bef774855bd75e9becbbd9a5f266
Ancestor: f4fb0bd39cf608649efd9f6e17e0c9b6b546eda9
Author: Timothy Brownawell  <address@hidden>
Date: 2009-08-16T00:42:40
Branch: net.venge.monotone.tbrownaw.serve_automate

Deleted entries:
        tests/netsync_stops_on_key_id_clash
        tests/netsync_stops_on_key_id_clash/__driver__.lua
        tests/spawn_redirected_hook_helper
        tests/spawn_redirected_hook_helper/__driver__.lua
        tests/spawn_redirected_hook_helper/testhooks
Added files:
        automate_ostream.hh
        tester-tests/running_commands/__driver__.lua
        tester-tests/running_commands/script
        tests/date_formatting/__driver__.lua
        tests/diff_reverse/__driver__.lua
        tests/duplicate_key_id/local_name.lua
        tests/exception-in-luaext/__driver__.lua
        tests/exception-in-luaext/evilrc.lua
        tests/move_conflicting_unversioned/__driver__.lua
        tests/revert_directory_blocked_by_unversioned_directory/__driver__.lua
        tests/revert_directory_blocked_by_unversioned_file/__driver__.lua
        tests/revert_directory_replaced_by_file/__driver__.lua
        tests/revert_file_blocked_by_unversioned_file/__driver__.lua
        tests/revert_file_replaced_by_directory/__driver__.lua
        tests/revert_renamed_directory_replaced_by_file/__driver__.lua
        tests/revert_renamed_file_replaced_by_directory/__driver__.lua
        tests/revert_uncommitted_execute_attr/__driver__.lua
        tests/serve-automate/__driver__.lua
        tests/skip_invalid_paths/__driver__.lua
        tests/update_loses_execute/__driver__.lua
        tests/w_selector/__driver__.lua
Added directories:
        tester-tests/running_commands tests/date_formatting
        tests/diff_reverse tests/exception-in-luaext
        tests/move_conflicting_unversioned
        tests/revert_directory_blocked_by_unversioned_directory
        tests/revert_directory_blocked_by_unversioned_file
        tests/revert_directory_replaced_by_file
        tests/revert_file_blocked_by_unversioned_file
        tests/revert_file_replaced_by_directory
        tests/revert_renamed_directory_replaced_by_file
        tests/revert_renamed_file_replaced_by_directory
        tests/revert_uncommitted_execute_attr tests/serve-automate
        tests/skip_invalid_paths tests/update_loses_execute
        tests/w_selector
Modified files:
        INSTALL Makefile.am NEWS UPGRADE annotate.cc automate.cc
        base.hh cert.cc cert.hh charset.cc charset.hh cmd.hh
        cmd_automate.cc cmd_db.cc cmd_diff_log.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 constants.hh
        contrib/monotone-mail-notify.sh database.cc database.hh
        database_check.cc dates.cc dates.hh file_io.cc git_export.cc
        key_store.cc key_store.hh keys.cc keys.hh lua.hh
        lua_hooks.cc lua_hooks.hh merge_conflict.cc merge_content.cc
        migrate_ancestry.cc migrate_schema.cc migration.hh
        monotone.cc monotone.texi netcmd.cc netcmd.hh netsync.cc
        netxx_pipe.cc options_list.hh packet.cc packet.hh paths.cc
        paths.hh po/de.po po/es.po po/it.po po/sv.po project.cc
        project.hh rcs_import.cc sanity.cc sanity.hh schema.sql
        selectors.cc std_hooks.lua tester-plaf.hh tester.cc
        testlib.lua
        tests/_MTN_case-folding_security_patch/__driver__.lua
        tests/automate_cert/expected tests/automate_certs/expected
        tests/automate_content_diff/__driver__.lua
        tests/automate_inventory_options/test_hooks.lua
        tests/automate_keys/__driver__.lua
        tests/changing_passphrase_of_a_private_key/__driver__.lua
        tests/commit_default_editor/test_hooks.lua
        tests/common/netsync-hooks_with_notes.lua
        tests/creating_a_bad_criss-cross_merge/alice.lua
        tests/creating_a_bad_criss-cross_merge/bob.lua
        tests/database_check/__driver__.lua
        tests/db_check_and_non-serious_errors/__driver__.lua
        tests/db_data_format_checking/__driver__.lua
        tests/do_not_log_the_result_of_hook_get_passphrase/hook.lua
        tests/drop_a_public_and_private_key/__driver__.lua
        tests/drop_a_public_key/__driver__.lua
        tests/duplicate_key_id/__driver__.lua
        tests/generating_and_extracting_keys_and_certs/__driver__.lua
        tests/importing_cvs_tricky_repo_with_tags/test.tags
        tests/key_files_created_securely/__driver__.lua
        tests/min_hooks.lua
        tests/mtn_execute_attr_respects_umask/__driver__.lua
        tests/netsync_duplicate_keys/__driver__.lua
        tests/netsync_permissions/__driver__.lua
        tests/p_selector/__driver__.lua
        tests/quiet_turns_off_tickers_but_not_warnings/__driver__.lua
        tests/read_and_convert_old_privkey_packet/__driver__.lua
        tests/resolve_conflicts_content/update-1
        tests/resolve_conflicts_none/update-1
        tests/revert_attrs/__driver__.lua
        tests/revert_file_blocked_by_unversioned_directory/__driver__.lua
        tests/revert_the_middle_of_a_sequence/__driver__.lua
        tests/schema_migration/__driver__.lua
        tests/schema_migration_with_rosterify/__driver__.lua
        tests/ssh_agent/__driver__.lua tests/test_hooks.lua
        tests/trust_hooks_and_trusted_command/__driver__.lua
        tests/unnormalized_paths_in_database/__driver__.lua txt2c.cc
        ui.cc ui.hh unit-tests/netcmd.cc unit-tests/packet.cc
        unit-tests/roster.cc unit_tester.cc unix/process.cc
        unix/terminal.cc unix/tester-plaf.cc update.cc
        visualc/config.h vocab.cc vocab.hh vocab_terms.hh
        win32/README win32/monotone.iss win32/terminal.cc
        win32/tester-plaf.cc work.cc work.hh

ChangeLog: 

merge in keys-by-hash branch


monotone --db={your.database} diff 
--revision=10a6963129c0bef774855bd75e9becbbd9a5f266 
--revision=40dd888f750771fe6042982debd3213694c4c1ca
monotone --db={your.database} diff 
--revision=f4fb0bd39cf608649efd9f6e17e0c9b6b546eda9 
--revision=40dd888f750771fe6042982debd3213694c4c1ca
----------------------------------------------------------------------