[Monotone-commits-diffs] Revision d18890eb43c55791050ea30073cc8a4978003c0e

[monotone]

-----------------------------------------------------------------
Revision: d18890eb43c55791050ea30073cc8a4978003c0e
Ancestor: 78f4db157a353de19b33df875959efc2492812b4
Ancestor: c9717c9a3093a230e99c90f479c3eebcc5f797e3
Author: Timothy Brownawell  <address@hidden>
Date: 08/01/10 22:30:49
Branch: net.venge.monotone.visualc

Deleted entries:
        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
        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_validation_lua_hook to tests/validate_commit_message_hook
Added files:
        netsync.hh
        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_log/__driver__.lua
        tests/clone_aborts_on_branch_pattern_in_uri/__driver__.lua
        tests/db_kill_certs_locally/__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/disapproving_of_bad_revision_range/__driver__.lua
        tests/extended-selectors/__driver__.lua
        tests/k_selector/__driver__.lua tests/k_selector/rcfile
        tests/key_files_deleted_securely/__driver__.lua
        tests/rename_warns_on_subdir_move/__driver__.lua
        tests/status_with_no_key/__driver__.lua
        tests/trust_hooks_and_trusted_command/hooks.lua
        tests/update_does_not_suggest_suspended_branches/__driver__.lua
        tests/validate_changes_hook/__driver__.lua
        tests/validate_changes_hook/commit_validate.lua
        tests/validate_changes_hook/errmsg
        tests/warn_on_weird_branch_names/__driver__.lua
        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
Added directories:
        tests/annotate_ignores_untrusted_certs tests/automate_log
        tests/clone_aborts_on_branch_pattern_in_uri
        tests/db_kill_certs_locally
        tests/disapproving_of_a_merge_revision
        tests/disapproving_of_a_revision_range
        tests/disapproving_of_bad_revision_range
        tests/extended-selectors tests/k_selector
        tests/key_files_deleted_securely
        tests/rename_warns_on_subdir_move tests/status_with_no_key
        tests/update_does_not_suggest_suspended_branches
        tests/validate_changes_hook tests/warn_on_weird_branch_names
Modified files:
        .mtn-ignore INSTALL Makefile.am NEWS README.visualc UPGRADE
        annotate.cc automate.cc automate_ostream.hh base.hh
        cmd_automate.cc cmd_db.cc cmd_diff_log.cc cmd_key_cert.cc
        cmd_merging.cc cmd_netsync.cc cmd_othervcs.cc cmd_packet.cc
        cmd_ws_commit.cc configure.ac contrib/mtn_makepermissions
        database.cc database.hh diff_output.cc globish.cc globish.hh
        key_store.cc keys.cc keys.hh lua-testsuite.lua lua_hooks.cc
        lua_hooks.hh merge_conflict.cc monotone.cc monotone.texi
        netcmd.cc netcmd.hh netsync.cc network/connection_info.cc
        network/connection_info.hh network/netsync_session.hh
        network/session.hh network/wrapped_session.cc
        network/wrapped_session.hh netxx/osutil.h
        notes/release-checklist.txt option.hh options_list.hh
        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
        roster.cc roster.hh sanity.cc selectors.cc selectors.hh
        std_hooks.lua tester.cc testlib.lua
        tests/attr_mtn_execute/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected.stderr
        tests/automate_inventory_ignore_dirs/expected_2.stderr
        tests/branch_leaves_sync_bug/__driver__.lua
        tests/cert_no_branch/__driver__.lua
        tests/changelog_editor/__driver__.lua
        tests/changelog_editor/changelog.lua
        tests/clone_branch_no_dir/__driver__.lua
        tests/clone_creates__MTN_log/__driver__.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/common/automate_ancestry.lua
        tests/common/automate_stdio.lua tests/common/netsync.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_patch_drop/__driver__.lua
        tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/fail_cleanly_on_unreadable_db/__driver__.lua
        tests/imp_test_filesync_confdir/__driver__.lua
        tests/import/__driver__.lua tests/log_dir/__driver__.lua
        tests/log_with_restriction/__driver__.lua
        tests/logging_a_file_within_revision_outside_a_workspace/__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/renaming_a_directory/__driver__.lua
        tests/resolve_conflicts_all_merge_commands/__driver__.lua
        tests/resolve_conflicts_errors/__driver__.lua
        tests/restriction_includes_parent_dir/__driver__.lua
        tests/serve-automate/__driver__.lua
        tests/serve-automate-single-run/__driver__.lua
        tests/test_hooks.lua
        tests/trust_hooks_and_trusted_command/__driver__.lua
        tests/update_ignores_suspended_heads/__driver__.lua
        tests/update_to_off-branch_rev/__driver__.lua texinfo.css
        transforms.cc txt2c.cc unit-tests/dates.cc
        unit-tests/roster.cc unix/process.cc update.cc update.hh
        uri.cc uri.hh visualc/config.h visualc/monotone.sln
        visualc/tester.vcxproj visualc/tester.vcxproj.filters
        visualc/unistd.h visualc/unit_tester.vcxproj
        visualc/unit_tester.vcxproj.filters vocab.cc vocab.hh
        win32/fs.cc win32/parse_date.cc win32/process.cc work.cc
        work.hh

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=78f4db157a353de19b33df875959efc2492812b4 
--revision=d18890eb43c55791050ea30073cc8a4978003c0e
monotone --db={your.database} diff 
--revision=c9717c9a3093a230e99c90f479c3eebcc5f797e3 
--revision=d18890eb43c55791050ea30073cc8a4978003c0e
----------------------------------------------------------------------