[Monotone-commits-diffs] Revision 64a202f5a676b1f8bf3c27c7e058e10ac216925e

[monotone]

-----------------------------------------------------------------
Revision: 64a202f5a676b1f8bf3c27c7e058e10ac216925e
Ancestor: 135daf2a16c656018ee6f3e60fd13544f4ac751b
Ancestor: e9d3cf2211208cd9a6da0e2d749e9e359a991499
Author: Timothy Brownawell  <address@hidden>
Date: 2010-06-09 19.35.54
Branch: net.venge.monotone.visualc

Deleted entries:
        tests/(todo)_write_monotone-agent
        tests/(todo)_write_monotone-agent/__driver__.lua
        visualc/botan.vcproj visualc/lua.vcproj
        visualc/monotone.vcproj visualc/netxx.vcproj
        visualc/pcre.vcproj visualc/sqlite3.vcproj
        visualc/stringprep.vcproj visualc/tester.vcproj
        visualc/txt2c.vcproj visualc/unit_tester.vcproj
Renamed entries:
        README.visualc8 to README.visualc
        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
        rev_output.cc rev_output.hh
        tests/add,remove,cleanup_registered_workspaces/__driver__.lua
        
tests/automate_inventory_options/expected-renames-target-no-unchanged.stdout
        tests/automate_update/__driver__.lua
        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/change_workspace/__driver__.lua
        tests/change_workspace/test_hooks.lua
        tests/changelog_editor/__driver__.lua
        tests/changelog_editor/changelog.lua
        tests/database_aliases/__driver__.lua
        tests/database_aliases/rcfile.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/keep_valid_workspace_options_on_error/__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/netsync_per_server_defaults/__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/unchanged_options_preserves_mtime/__driver__.lua
        tests/undrop/__driver__.lua
        tests/update_ignores_suspended_heads/__driver__.lua
        unix/parse_date.cc visualc/libplatform.vcxproj
        visualc/libplatform.vcxproj.filters visualc/monotone.vcxproj
        visualc/monotone.vcxproj.filters visualc/netxx.vcxproj
        visualc/netxx.vcxproj.filters visualc/tester.vcxproj
        visualc/tester.vcxproj.filters visualc/txt2c.vcxproj
        visualc/txt2c.vcxproj.filters visualc/unit_tester.vcxproj
        visualc/unit_tester.vcxproj.filters win32/dlls.sh
        win32/parse_date.cc
Added directories:
        tests/add,remove,cleanup_registered_workspaces
        tests/automate_update tests/bad_and_unknown_certs
        tests/branch_leaves_sync_bug tests/catch_lua_output
        tests/cert_no_branch tests/change_workspace
        tests/changelog_editor tests/database_aliases
        tests/db_check_branch_leaves tests/diff_patch_add
        tests/diff_patch_drop tests/diff_patch_rename
        tests/disapproving_a_non_head
        tests/keep_valid_workspace_options_on_error
        tests/list_databases
        tests/log_recognizes_invalid_workspace_parent
        tests/log_with_windows_dirsep tests/merge_--update
        tests/netsync_per_server_defaults
        tests/setup_and_clone_keep_bookkeeping_dir
        tests/setup_creates_default_db
        tests/unchanged_options_preserves_mtime tests/undrop
        tests/update_ignores_suspended_heads
Modified files:
        .mtn-ignore HACKING INSTALL Makefile.am NEWS README.visualc
        app_state.cc app_state.hh automate_ostream.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_packet.cc
        cmd_ws_commit.cc configure.ac contrib/Monotone.pm
        contrib/edit_comment_from_changelog.lua database.cc
        database.hh database_check.cc dates.cc dates.hh file_io.hh
        key_store.cc keys.cc keys.hh lazy_rng.hh lua_hooks.cc
        lua_hooks.hh merge_content.cc merge_content.hh
        migrate_ancestry.cc monotone.cc monotone.texi netcmd.hh
        network/automate_session.cc network/netsync_session.cc
        network/reactor.cc network/session.cc netxx/osutil.h
        netxx_pipe.cc notes/release-checklist.txt option.hh
        options_list.hh outdated_indicator.cc outdated_indicator.hh
        packet.cc paths.cc paths.hh pch.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 selectors.cc selectors.hh
        simplestring_xform.cc simplestring_xform.hh std_hooks.lua
        tester.cc testlib.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/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-hooks.lua
        tests/db_check_and_non-serious_errors/__driver__.lua
        tests/db_kill_tag_locally/__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/empty_environment/__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/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/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/move_conflicting_unversioned/__driver__.lua
        tests/netsync_default_server_pattern/__driver__.lua
        tests/netsync_over_pipes/__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/serve-automate/__driver__.lua
        tests/serve-automate-single-run/__driver__.lua
        tests/status/__driver__.lua
        tests/subdirectory_restrictions/__driver__.lua
        tests/suspend/__driver__.lua
        tests/tags_and_tagging_of_revisions/__driver__.lua
        tests/use_restrictions_with_--exclude/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc tests/vars/__driver__.lua
        transforms.cc txt2c.cc unit-tests/dates.cc
        unit-tests/restrictions.cc unit-tests/simplestring_xform.cc
        unit_tester.cc unix/process.cc visualc/config.h
        visualc/libplatform.vcxproj
        visualc/libplatform.vcxproj.filters visualc/monotone.sln
        visualc/monotone.vcxproj visualc/monotone.vcxproj.filters
        visualc/unistd.h vocab.cc vocab.hh win32/README win32/fs.cc
        win32/main.cc win32/monotone.iss.in win32/parse_date.cc
        win32/process.cc work.cc work.hh

ChangeLog: 

Merge in mainline changes.


monotone --db={your.database} diff 
--revision=135daf2a16c656018ee6f3e60fd13544f4ac751b 
--revision=64a202f5a676b1f8bf3c27c7e058e10ac216925e
monotone --db={your.database} diff 
--revision=e9d3cf2211208cd9a6da0e2d749e9e359a991499 
--revision=64a202f5a676b1f8bf3c27c7e058e10ac216925e
----------------------------------------------------------------------