[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 4a3945e6ae50fdd016bf3901d86465387013d9
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 4a3945e6ae50fdd016bf3901d86465387013d94a |
Date: |
Sat, 19 Jun 2010 03:26:55 +0200 |
-----------------------------------------------------------------
Revision: 4a3945e6ae50fdd016bf3901d86465387013d94a
Ancestor: 795d81068d2abf6d8d63392c766c8620510e1b07
Ancestor: 87d73a0c5642a876cfff43b13a4b2a590eb66ab6
Author: Timothy Brownawell <address@hidden>
Date: 06/19/10 03:23:32
Branch: net.venge.monotone.options
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:
automate_stdio_helpers.hh netsync.hh option_reset_info.hh
options_applicator.cc options_applicator.hh
tests/cancelled_arguments/__driver__.lua
tests/clone_aborts_on_branch_pattern_in_uri/__driver__.lua
tests/db_kill_certs_locally/__driver__.lua
Added directories:
tests/cancelled_arguments
tests/clone_aborts_on_branch_pattern_in_uri
tests/db_kill_certs_locally
Modified files:
Makefile.am NEWS app_state.hh automate.cc cmd.cc cmd.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_ws_commit.cc commands.hh
contrib/monotone.bash_completion
contrib/monotone.zsh_completion database.cc database.hh
globish.cc globish.hh key_store.cc keys.cc keys.hh
lua-testsuite.lua lua_hooks.cc lua_hooks.hh
maybe_workspace_updater.cc monotone.cc monotone.texi
netcmd.hh netsync.cc network/automate_session.cc
network/connection_info.cc network/connection_info.hh
network/wrapped_session.cc network/wrapped_session.hh
option.cc option.hh options.cc options.hh options_list.hh
po/de.po sanity.cc sanity.hh 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/default_command_options/__driver__.lua
tests/default_command_options/default_options.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/test_the_version_command/__driver__.lua
tests/update_to_off-branch_rev/__driver__.lua
tests/user_commands/__driver__.lua
tests/user_commands/extra_rc ui.cc ui.hh unit-testsuite.lua
unix/main.cc uri.cc uri.hh vocab.hh win32/main.cc
win32/parse_date.cc work.cc
ChangeLog:
merge in mainline changes
monotone --db={your.database} diff
--revision=795d81068d2abf6d8d63392c766c8620510e1b07
--revision=4a3945e6ae50fdd016bf3901d86465387013d94a
monotone --db={your.database} diff
--revision=87d73a0c5642a876cfff43b13a4b2a590eb66ab6
--revision=4a3945e6ae50fdd016bf3901d86465387013d94a
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 4a3945e6ae50fdd016bf3901d86465387013d94a,
monotone <=