[Monotone-commits-nodiffs] Revision 2bc276f01f48842baad27450cfd2ad03cf3dbd52

[monotone]

-----------------------------------------------------------------
Revision: 2bc276f01f48842baad27450cfd2ad03cf3dbd52
Ancestor: 58b6b1075a491de40223abe0fc92653bdcba75c5
Ancestor: 70dc0d69ef2dbaf6fe126edf4085b402fec63490
Author: address@hidden
Date: 2010-05-30 02.39.53
Branch: net.venge.monotone

Deleted entries:
        tests/(todo)_write_monotone-agent
        tests/(todo)_write_monotone-agent/__driver__.lua
Renamed entries:
        tests/commit_using__MTN_log/commit_log.lua to 
tests/commit_using__MTN_log/commit_cancelled.lua
        tests/commit_using__MTN_log/commit_log_modified_return.lua to 
tests/commit_using__MTN_log/commit_confirmed.lua
        tests/restricted_diff_bug to tests/restricted_diff_file_in_renamed_dir
        tests/restriction_excludes_parent_dir to 
tests/restriction_includes_parent_dir
Added files:
        maybe_workspace_updater.cc maybe_workspace_updater.hh
        rev_output.cc rev_output.hh
        
tests/automate_inventory_options/expected-renames-target-no-unchanged.stdout
        tests/bad_and_unknown_certs/__driver__.lua
        tests/branch_leaves_sync_bug/__driver__.lua
        tests/catch_lua_output/__driver__.lua
        tests/catch_lua_output/hooks.lua
        tests/catch_lua_output/hooks_automate.lua
        tests/cert_no_branch/__driver__.lua
        tests/changelog_editor/__driver__.lua
        tests/changelog_editor/changelog.lua
        tests/db_check_branch_leaves/__driver__.lua
        tests/diff_patch_add/__driver__.lua
        tests/diff_patch_drop/__driver__.lua
        tests/diff_patch_rename/__driver__.lua
        tests/disapproving_a_non_head/__driver__.lua
        tests/log_with_windows_dirsep/__driver__.lua
        tests/merge_--update/__driver__.lua
        tests/setup_and_clone_keep_bookkeeping_dir/__driver__.lua
        tests/undrop/__driver__.lua unix/parse_time.cc
        win32/parse_time.cc
Added directories:
        tests/bad_and_unknown_certs tests/branch_leaves_sync_bug
        tests/catch_lua_output tests/cert_no_branch
        tests/changelog_editor tests/db_check_branch_leaves
        tests/diff_patch_add tests/diff_patch_drop
        tests/diff_patch_rename tests/disapproving_a_non_head
        tests/log_with_windows_dirsep tests/merge_--update
        tests/setup_and_clone_keep_bookkeeping_dir tests/undrop
Modified files:
        Makefile.am NEWS cmd_diff_log.cc cmd_key_cert.cc
        cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc
        contrib/edit_comment_from_changelog.lua database.cc
        database.hh database_check.cc dates.cc dates.hh keys.cc
        keys.hh lua_hooks.cc lua_hooks.hh migrate_ancestry.cc
        monotone.texi options_list.hh platform.hh restrictions.cc
        restrictions.hh simplestring_xform.cc simplestring_xform.hh
        std_hooks.lua tests/_--author,_--date/__driver__.lua
        tests/_--rcfile=-/__driver__.lua
        tests/_--rcfile=directory/aaa.rc
        tests/_--rcfile=directory/aba.rc
        tests/_--rcfile=directory/bbb.rc
        
tests/_MTN_files_handled_correctly_in_aborted_commit/bad_edit_comment.lua
        tests/attr_command_in_subdirs/__driver__.lua
        tests/attr_set_get_commands/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected.stderr
        tests/automate_inventory_ignore_dirs/expected.stdout
        tests/automate_inventory_ignore_dirs/expected_2.stderr
        tests/automate_inventory_ignore_dirs/expected_2.stdout
        tests/automate_inventory_options/__driver__.lua
        tests/automate_inventory_options/expected-no-ignored.stdout
        tests/automate_inventory_options/expected-no-unknown.stdout
        tests/automate_inventory_options/expected-none.stdout
        tests/automate_inventory_options/expected-renames-both.stdout
        tests/automate_inventory_options/expected-renames-source.stdout
        
tests/automate_inventory_options/expected-renames-target-no-ignored.stdout
        
tests/automate_inventory_options/expected-renames-target-no-unknown.stdout
        tests/automate_inventory_options/expected-renames-target.stdout
        tests/automate_inventory_restricted/__driver__.lua
        tests/change_workspace/__driver__.lua
        tests/checkout_creates__MTN_log/commit_log.lua
        tests/clone_creates__MTN_log/commit_log.lua
        tests/commit_default_editor/__driver__.lua
        tests/commit_default_editor/test_hooks.lua
        tests/commit_using__MTN_log/__driver__.lua
        tests/commit_using__MTN_log/commit_cancelled.lua
        tests/commit_using__MTN_log/commit_confirmed.lua
        tests/commit_using__MTN_log_and_--message/commit_log.lua
        tests/commit_validation_lua_hook/errmsg
        tests/commit_with_--message-file/commit_log.lua
        tests/commit_writes_message_back_to__MTN_log/__driver__.lua
        tests/commit_writes_message_back_to__MTN_log/my_hook.lua
        tests/db_check_and_non-serious_errors/__driver__.lua
        tests/diff_--external/__driver__.lua
        tests/diff_against_empty_file/__driver__.lua
        tests/diff_on_missing_trailing_newline_at_end_of_file/__driver__.lua
        tests/diff_restriction_renamed_parent/__driver__.lua
        tests/diff_shows_renames/__driver__.lua
        tests/diffing_a_revision_with_an_added_file/__driver__.lua
        tests/fetching_nonexistent_entry_from_children_bug/__driver__.lua
        tests/git_export/__driver__.lua
        tests/i18n_commit_messages/__driver__.lua
        tests/i18n_commit_messages/euc-jp.txt
        tests/i18n_commit_messages/extra_hooks.lua
        tests/i18n_commit_messages/utf8.txt
        tests/importing_cvs_metadata/expected_log_output
        
tests/include()_includedir()_and_includedirpattern()_lua_functions/aaa.rc
        
tests/include()_includedir()_and_includedirpattern()_lua_functions/aba.rc
        
tests/include()_includedir()_and_includedirpattern()_lua_functions/bbb.zz
        tests/log_--diffs/__driver__.lua
        tests/log_--diffs/expect_full
        tests/log_--diffs/expect_restrict
        tests/log_dir/__driver__.lua
        tests/log_with_restriction/__driver__.lua
        tests/lua_function_existsonpath/__driver__.lua
        tests/manifest_restrictions/__driver__.lua
        tests/merge_into_workspace/__driver__.lua
        tests/merge_into_workspace/expected-log
        tests/merge_into_workspace/expected-log-left
        tests/merge_update_part_of_file/__driver__.lua
        tests/resolve_conflicts_all_resolutions/__driver__.lua
        tests/resolve_conflicts_all_resolutions/merge-1
        tests/resolve_conflicts_content/merge-1
        tests/resolve_conflicts_duplicate_name/merge-1
        tests/resolve_conflicts_none/merge-1
        tests/resolve_conflicts_propagate/propagate-1
        tests/resolve_conflicts_propagate/propagate-2
        tests/restricted_diff_file_in_renamed_dir/__driver__.lua
        tests/restriction_includes_parent_dir/__driver__.lua
        tests/restrictions_with_renames_and_adds/__driver__.lua
        tests/revert_file_to_base_revision/__driver__.lua
        tests/status/__driver__.lua
        tests/subdirectory_restrictions/__driver__.lua
        tests/suspend/__driver__.lua
        tests/use_restrictions_with_--exclude/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc unit-tests/dates.cc
        unit-tests/restrictions.cc unit-tests/simplestring_xform.cc
        work.cc work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone.bugfest-2010.20447-dscherger' (head 
70dc0d69ef2dbaf6fe126edf4085b402fec63490)
            to branch 'net.venge.monotone' (head 
58b6b1075a491de40223abe0fc92653bdcba75c5)


monotone --db={your.database} diff 
--revision=58b6b1075a491de40223abe0fc92653bdcba75c5 
--revision=2bc276f01f48842baad27450cfd2ad03cf3dbd52
monotone --db={your.database} diff 
--revision=70dc0d69ef2dbaf6fe126edf4085b402fec63490 
--revision=2bc276f01f48842baad27450cfd2ad03cf3dbd52
----------------------------------------------------------------------