[Monotone-commits-diffs] Revision a5b817d5deef4276dd6cf48fc752b7cd962221ee

[monotone]

-----------------------------------------------------------------
Revision: a5b817d5deef4276dd6cf48fc752b7cd962221ee
Ancestor: 6360ed281a60f63ccd9de1dc1511bfeec7897c59
Ancestor: fff0a83282c4ffc3ae306fe15d6cf624083649b0
Author: Timothy Brownawell  <address@hidden>
Date: 07/16/10 00:53:47
Branch: net.venge.monotone.options

Added files:
        automate_stdio_helpers.hh date_format.hh
        option_reset_info.hh options_applicator.cc
        options_applicator.hh
        tests/cancelled_arguments/__driver__.lua
        tests/warn_on_weird_branch_names/__driver__.lua
Added directories:
        tests/cancelled_arguments tests/warn_on_weird_branch_names
Modified files:
        Makefile.am NEWS annotate.cc app_state.hh automate.cc cmd.cc
        cmd.hh cmd_automate.cc cmd_db.cc cmd_diff_log.cc
        cmd_files.cc cmd_key_cert.cc cmd_list.cc cmd_merging.cc
        cmd_netsync.cc cmd_ws_commit.cc commands.cc commands.hh
        contrib/monotone.bash_completion
        contrib/monotone.zsh_completion database.cc diff_output.cc
        key_store.cc keys.cc lua-testsuite.lua lua_hooks.cc
        lua_hooks.hh maybe_workspace_updater.cc merge_conflict.cc
        monotone.cc monotone.texi netcmd.cc netsync.cc
        network/automate_session.cc network/connection_info.cc
        network/connection_info.hh network/listener.cc
        network/listener.hh network/make_server.cc
        network/make_server.hh network/session.cc option.cc
        option.hh options.cc options.hh options_list.hh project.cc
        sanity.cc sanity.hh
        tests/automate_inventory_ignore_dirs/expected.stderr
        tests/automate_inventory_ignore_dirs/expected_2.stderr
        tests/default_command_options/__driver__.lua
        tests/default_command_options/default_options.lua
        tests/renaming_a_directory/__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/test_the_version_command/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc ui.cc ui.hh unit-testsuite.lua
        unix/main.cc win32/main.cc work.cc

ChangeLog: 

merge in mainline changes.



monotone --db={your.database} diff 
--revision=6360ed281a60f63ccd9de1dc1511bfeec7897c59 
--revision=a5b817d5deef4276dd6cf48fc752b7cd962221ee
monotone --db={your.database} diff 
--revision=fff0a83282c4ffc3ae306fe15d6cf624083649b0 
--revision=a5b817d5deef4276dd6cf48fc752b7cd962221ee
----------------------------------------------------------------------