[Monotone-commits-diffs] Revision 6d6b152582351436cef4c8021cf86080acd80b81

[monotone]

-----------------------------------------------------------------
Revision: 6d6b152582351436cef4c8021cf86080acd80b81
Ancestor: 8675da8db99a03ac8c65fe92a04943310a771a91
Ancestor: 97595a2f1ea4f2b5481627c010e17b8f1dde99ba
Author: Timothy Brownawell  <address@hidden>
Date: 2009-06-02T03:40:35
Branch: net.venge.monotone.keys-by-hash

Deleted entries:
        tests/spawn_redirected_hook_helper
        tests/spawn_redirected_hook_helper/__driver__.lua
        tests/spawn_redirected_hook_helper/testhooks
Added files:
        tester-tests/running_commands/__driver__.lua
        tester-tests/running_commands/script
        tests/date_formatting/__driver__.lua
        tests/exception-in-luaext/__driver__.lua
        tests/exception-in-luaext/evilrc.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/update_loses_execute/__driver__.lua
        tests/w_selector/__driver__.lua
Added directories:
        tester-tests/running_commands tests/date_formatting
        tests/exception-in-luaext
        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/update_loses_execute tests/w_selector
Modified files:
        NEWS UPGRADE automate.cc base.hh cert.cc cert.hh charset.cc
        charset.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 database.cc database.hh database_check.cc
        dates.cc dates.hh git_export.cc key_store.cc key_store.hh
        keys.cc keys.hh lua.hh lua_hooks.cc lua_hooks.hh
        migrate_ancestry.cc migrate_schema.cc migration.hh
        monotone.texi netcmd.cc netcmd.hh netsync.cc options_list.hh
        packet.cc packet.hh po/de.po po/sv.po project.cc project.hh
        sanity.cc schema.sql selectors.cc std_hooks.lua testlib.lua
        tests/_MTN_case-folding_security_patch/__driver__.lua
        tests/db_data_format_checking/__driver__.lua
        tests/drop_a_public_and_private_key/__driver__.lua
        tests/drop_a_public_key/__driver__.lua
        tests/mtn_execute_attr_respects_umask/__driver__.lua
        tests/p_selector/__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/test_hooks.lua
        tests/unnormalized_paths_in_database/__driver__.lua
        unit-tests/netcmd.cc unit-tests/packet.cc unix/process.cc
        update.cc visualc/config.h vocab.cc vocab_terms.hh
        win32/README win32/monotone.iss work.cc work.hh

ChangeLog: 

Merge in mainline changes and fixup migration.


monotone --db={your.database} diff 
--revision=8675da8db99a03ac8c65fe92a04943310a771a91 
--revision=6d6b152582351436cef4c8021cf86080acd80b81
monotone --db={your.database} diff 
--revision=97595a2f1ea4f2b5481627c010e17b8f1dde99ba 
--revision=6d6b152582351436cef4c8021cf86080acd80b81
----------------------------------------------------------------------