[Monotone-commits-diffs] Revision 043333cc4ad846fd70d50d49a230862f10ca1487

[monotone]

-----------------------------------------------------------------
Revision: 043333cc4ad846fd70d50d49a230862f10ca1487
Ancestor: 904926cd8462db7743742a5c1d216245202813a7
Ancestor: df2bbcd8ebb9b15059cb1b3305b536b5ad6d90ae
Author: address@hidden
Date: 07/07/10 11:43:23
Branch: net.venge.monotone

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
Added files:
        netsync.hh
        tests/clone_aborts_on_branch_pattern_in_uri/__driver__.lua
        tests/db_kill_certs_locally/__driver__.lua
        tests/extended-selectors/__driver__.lua
        tests/status_with_no_key/__driver__.lua
        tests/update_does_not_suggest_suspended_branches/__driver__.lua
Added directories:
        tests/clone_aborts_on_branch_pattern_in_uri
        tests/db_kill_certs_locally tests/extended-selectors
        tests/status_with_no_key
        tests/update_does_not_suggest_suspended_branches
Modified files:
        INSTALL Makefile.am NEWS UPGRADE automate.cc base.hh
        cmd_automate.cc cmd_db.cc cmd_key_cert.cc cmd_merging.cc
        cmd_netsync.cc cmd_othervcs.cc cmd_packet.cc
        cmd_ws_commit.cc configure.ac database.cc database.hh
        globish.cc globish.hh keys.cc keys.hh lua-testsuite.lua
        monotone.texi netcmd.hh netsync.cc
        network/connection_info.cc network/connection_info.hh
        network/wrapped_session.cc network/wrapped_session.hh
        options_list.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 roster.cc roster.hh sanity.cc
        selectors.cc std_hooks.lua
        tests/attr_mtn_execute/__driver__.lua
        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/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/imp_test_filesync_confdir/__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/resolve_conflicts_all_merge_commands/__driver__.lua
        tests/update_ignores_suspended_heads/__driver__.lua
        tests/update_to_off-branch_rev/__driver__.lua texinfo.css
        unit-tests/dates.cc unit-tests/roster.cc update.cc update.hh
        uri.cc uri.hh visualc/config.h vocab.hh win32/parse_date.cc

ChangeLog: 

merge of '904926cd8462db7743742a5c1d216245202813a7'
     and 'df2bbcd8ebb9b15059cb1b3305b536b5ad6d90ae'


monotone --db={your.database} diff 
--revision=904926cd8462db7743742a5c1d216245202813a7 
--revision=043333cc4ad846fd70d50d49a230862f10ca1487
monotone --db={your.database} diff 
--revision=df2bbcd8ebb9b15059cb1b3305b536b5ad6d90ae 
--revision=043333cc4ad846fd70d50d49a230862f10ca1487
----------------------------------------------------------------------