[Monotone-commits-diffs] Revision 819cdf2fd99aee20da701bcce91c04c57804fc50

[monotone]

-----------------------------------------------------------------
Revision: 819cdf2fd99aee20da701bcce91c04c57804fc50
Ancestor: 01c85ac4fa0d6223c06a91e3df20d0e9b283fe92
Ancestor: 240c73b9011b6a885259401e48f5297b2db3e55a
Author: address@hidden
Date: 06/22/10 15:23:59
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
Added directories:
        tests/clone_aborts_on_branch_pattern_in_uri
        tests/db_kill_certs_locally
Modified files:
        INSTALL Makefile.am NEWS 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 database.cc
        database.hh globish.cc globish.hh keys.cc keys.hh
        merge_conflict.cc monotone.texi netcmd.hh netsync.cc
        network/connection_info.cc network/connection_info.hh
        options_list.hh tests/attr_mtn_execute/__driver__.lua
        tests/branch_leaves_sync_bug/__driver__.lua
        tests/cert_no_branch/__driver__.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/imp_test_filesync_confdir/__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_to_off-branch_rev/__driver__.lua uri.cc uri.hh
        vocab.hh

ChangeLog: 

merge of '01c85ac4fa0d6223c06a91e3df20d0e9b283fe92'
     and '240c73b9011b6a885259401e48f5297b2db3e55a'




monotone --db={your.database} diff 
--revision=01c85ac4fa0d6223c06a91e3df20d0e9b283fe92 
--revision=819cdf2fd99aee20da701bcce91c04c57804fc50
monotone --db={your.database} diff 
--revision=240c73b9011b6a885259401e48f5297b2db3e55a 
--revision=819cdf2fd99aee20da701bcce91c04c57804fc50
----------------------------------------------------------------------