[Monotone-commits-nodiffs] Revision 05b0532e6119eda62106e8a69ff9885b9465f2cb

[monotone]

-----------------------------------------------------------------
Revision: 05b0532e6119eda62106e8a69ff9885b9465f2cb
Ancestor: 65372a532bdb64961dc9a51738cb0cb646246a46
Ancestor: a5b817d5deef4276dd6cf48fc752b7cd962221ee
Author: Timothy Brownawell  <address@hidden>
Date: 07/17/10 19:43:26
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/key_files_deleted_securely/__driver__.lua
Added directories:
        tests/cancelled_arguments tests/key_files_deleted_securely
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 key_store.cc
        keys.cc lua-testsuite.lua lua_hooks.cc lua_hooks.hh
        maybe_workspace_updater.cc merge_conflict.cc monotone.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/default_command_options/__driver__.lua
        tests/default_command_options/default_options.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=65372a532bdb64961dc9a51738cb0cb646246a46 
--revision=05b0532e6119eda62106e8a69ff9885b9465f2cb
monotone --db={your.database} diff 
--revision=a5b817d5deef4276dd6cf48fc752b7cd962221ee 
--revision=05b0532e6119eda62106e8a69ff9885b9465f2cb
----------------------------------------------------------------------