[Monotone-commits-diffs] Revision c744a24c34d6a732cf4a2c94bc740509e0c17849

[monotone]

-----------------------------------------------------------------
Revision: c744a24c34d6a732cf4a2c94bc740509e0c17849
Ancestor: c4e4750a4769be91f837376b745c5eba917711c7
Ancestor: ffed149ff169f774c82597d42ffc2f75f605cae6
Author: address@hidden
Date: 06/28/10 17:45:40
Branch: net.venge.monotone.tkoskine.disapprove-multirev

Deleted entries:
        tests/(todo)_write_monotone-agent
        tests/(todo)_write_monotone-agent/__driver__.lua
        tests/db_kill_branch_certs_locally_command
        tests/db_kill_branch_certs_locally_command/__driver__.lua
        tests/db_kill_tag_locally
        tests/db_kill_tag_locally/__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
        win32/monotone.iss to win32/monotone.iss.in
Added files:
        maybe_workspace_updater.cc maybe_workspace_updater.hh
        netsync.hh rev_output.cc rev_output.hh
        tests/add,remove,cleanup_registered_workspaces/__driver__.lua
        tests/annotate_ignores_untrusted_certs/__driver__.lua
        tests/annotate_ignores_untrusted_certs/all_untrusted.lua
        tests/annotate_ignores_untrusted_certs/author_untrusted.lua
        tests/annotate_ignores_untrusted_certs/date_untrusted.lua
        
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/clone_aborts_on_branch_pattern_in_uri/__driver__.lua
        tests/database_aliases/__driver__.lua
        tests/database_aliases/rcfile.lua
        tests/db_check_branch_leaves/__driver__.lua
        tests/db_kill_certs_locally/__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/disapproving_of_a_merge_revision/__driver__.lua
        tests/disapproving_of_a_merge_revision/badfile
        tests/disapproving_of_a_merge_revision/badfile2
        tests/disapproving_of_a_merge_revision/goodfile
        tests/disapproving_of_a_merge_revision/rootfile
        tests/disapproving_of_a_revision_range/__driver__.lua
        tests/disapproving_of_a_revision_range/badfile
        tests/disapproving_of_a_revision_range/badfile2
        tests/disapproving_of_a_revision_range/finalfile
        tests/disapproving_of_a_revision_range/goodfile
        tests/disapproving_of_a_revision_range/rootfile
        tests/disapproving_of_a_revision_range/updatefile
        tests/extended-selectors/__driver__.lua
        tests/list_databases/__driver__.lua
        tests/list_databases/rcfile.lua
        tests/log_recognizes_invalid_workspace_parent/__driver__.lua
        tests/log_with_windows_dirsep/__driver__.lua
        tests/merge_--update/__driver__.lua
        tests/setup_and_clone_keep_bookkeeping_dir/__driver__.lua
        tests/setup_creates_default_db/__driver__.lua
        tests/setup_creates_default_db/rcfile.lua
        tests/status_with_no_key/__driver__.lua
        tests/undrop/__driver__.lua
        tests/update_does_not_suggest_suspended_branches/__driver__.lua
        tests/update_ignores_suspended_heads/__driver__.lua
        unix/parse_date.cc win32/dlls.sh win32/parse_date.cc
Added directories:
        tests/add,remove,cleanup_registered_workspaces
        tests/annotate_ignores_untrusted_certs
        tests/bad_and_unknown_certs tests/branch_leaves_sync_bug
        tests/catch_lua_output tests/cert_no_branch
        tests/changelog_editor
        tests/clone_aborts_on_branch_pattern_in_uri
        tests/database_aliases tests/db_check_branch_leaves
        tests/db_kill_certs_locally tests/diff_patch_add
        tests/diff_patch_drop tests/diff_patch_rename
        tests/disapproving_a_non_head
        tests/disapproving_of_a_merge_revision
        tests/disapproving_of_a_revision_range
        tests/extended-selectors tests/list_databases
        tests/log_recognizes_invalid_workspace_parent
        tests/log_with_windows_dirsep tests/merge_--update
        tests/setup_and_clone_keep_bookkeeping_dir
        tests/setup_creates_default_db tests/status_with_no_key
        tests/undrop
        tests/update_does_not_suggest_suspended_branches
        tests/update_ignores_suspended_heads
Modified files:
        HACKING INSTALL Makefile.am NEWS UPGRADE annotate.cc
        app_state.cc app_state.hh automate.cc base.hh cmd.cc
        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
        contrib/edit_comment_from_changelog.lua database.cc
        database.hh database_check.cc dates.cc dates.hh file_io.hh
        globish.cc globish.hh key_store.cc keys.cc keys.hh
        lazy_rng.hh lua-testsuite.lua lua_hooks.cc lua_hooks.hh
        migrate_ancestry.cc monotone.cc monotone.texi netcmd.hh
        netsync.cc network/automate_session.cc
        network/connection_info.cc network/connection_info.hh
        network/netsync_session.cc network/session.cc
        network/wrapped_session.cc network/wrapped_session.hh
        netxx_pipe.cc notes/release-checklist.txt options_list.hh
        outdated_indicator.cc outdated_indicator.hh packet.cc
        paths.cc paths.hh platform.hh po/de.po po/es.po po/fr.po
        po/it.po po/ja.po po/pt.po po/pt_BR.po po/sv.po project.cc
        project.hh restrictions.cc restrictions.hh roster.cc
        roster.hh sanity.cc selectors.cc 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_mtn_execute/__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_branch_no_dir/__driver__.lua
        tests/clone_creates__MTN_log/__driver__.lua
        tests/clone_creates__MTN_log/commit_log.lua
        tests/clone_creates_right__MTN_options/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/clone_warning_with_multiple_heads/__driver__.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/common/netsync.lua
        tests/db_check_and_non-serious_errors/__driver__.lua
        tests/db_kill_rev_locally/__driver__.lua
        tests/db_kill_rev_locally_and_recommit/__driver__.lua
        tests/db_kill_rev_locally_workspace/__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_file_within_revision_outside_a_workspace/__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/imp_test_filesync_confdir/__driver__.lua
        tests/import/__driver__.lua
        tests/importing_cvs_metadata/expected_log_output
        tests/importing_cvs_tricky_repo_with_tags/test.tags
        
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/logging_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/ls_tags_with_ambiguous_tags/__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/netsync_default_server_pattern/__driver__.lua
        tests/netsync_mtn_uri_scheme/__driver__.lua
        tests/netsync_over_pipes/__driver__.lua
        tests/netsync_verifies_server_keys/__driver__.lua
        tests/resolve_conflicts_all_merge_commands/__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/tags_and_tagging_of_revisions/__driver__.lua
        tests/update_to_off-branch_rev/__driver__.lua
        tests/use_restrictions_with_--exclude/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc tests/vars/__driver__.lua
        texinfo.css unit-tests/dates.cc unit-tests/restrictions.cc
        unit-tests/roster.cc unit-tests/simplestring_xform.cc
        update.cc update.hh uri.cc uri.hh visualc/config.h vocab.hh
        win32/README win32/main.cc win32/monotone.iss.in
        win32/process.cc work.cc work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
ffed149ff169f774c82597d42ffc2f75f605cae6)
            to branch 'net.venge.monotone.tkoskine.disapprove-multirev' (head 
c4e4750a4769be91f837376b745c5eba917711c7)


monotone --db={your.database} diff 
--revision=c4e4750a4769be91f837376b745c5eba917711c7 
--revision=c744a24c34d6a732cf4a2c94bc740509e0c17849
monotone --db={your.database} diff 
--revision=ffed149ff169f774c82597d42ffc2f75f605cae6 
--revision=c744a24c34d6a732cf4a2c94bc740509e0c17849
----------------------------------------------------------------------