-----------------------------------------------------------------
Revision: 94f81529753ff1942cdd805642d1f1bf5640e8e0
Ancestor: 4fd880923233f87e12fb199241937631c56cbf74
Ancestor: 89f7e1ec105d1a1d43c2988ea79e2bcf4007956b
Author: Timothy Brownawell <[email protected]>
Date: 06/18/10 03:32:22
Branch: net.venge.monotone.connection_info_cleanup
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:
Makefile.am NEWS automate.cc cmd_db.cc cmd_key_cert.cc
cmd_merging.cc cmd_netsync.cc cmd_othervcs.cc
cmd_ws_commit.cc database.cc database.hh globish.cc
globish.hh keys.cc keys.hh 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
selectors.cc 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 win32/parse_date.cc
ChangeLog:
merge in mainline changes
monotone --db={your.database} diff
--revision=4fd880923233f87e12fb199241937631c56cbf74
--revision=94f81529753ff1942cdd805642d1f1bf5640e8e0
monotone --db={your.database} diff
--revision=89f7e1ec105d1a1d43c2988ea79e2bcf4007956b
--revision=94f81529753ff1942cdd805642d1f1bf5640e8e0
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
