[Monotone-commits-diffs] Revision 0ef3b8b967567dc9aef7d20a28c950d6f62a3099

[monotone]

-----------------------------------------------------------------
Revision: 0ef3b8b967567dc9aef7d20a28c950d6f62a3099
Ancestor: 302cf43bd4f29e93b2efa272f00daf42c7308861
Ancestor: a724c24fdbad0f3b862005bd00399b1f1dd24e3c
Author: Timothy Brownawell  <address@hidden>
Date: 07/18/10 21:53:59
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/k_selector/__driver__.lua tests/k_selector/rcfile
Added directories:
        tests/cancelled_arguments tests/k_selector
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
        constants.hh contrib/monotone.bash_completion
        contrib/monotone.zsh_completion database.cc database.hh
        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 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 selectors.cc
        tests/date_formatting/__driver__.lua
        tests/default_command_options/__driver__.lua
        tests/default_command_options/default_options.lua
        tests/resolve_conflicts_errors/__driver__.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=302cf43bd4f29e93b2efa272f00daf42c7308861 
--revision=0ef3b8b967567dc9aef7d20a28c950d6f62a3099
monotone --db={your.database} diff 
--revision=a724c24fdbad0f3b862005bd00399b1f1dd24e3c 
--revision=0ef3b8b967567dc9aef7d20a28c950d6f62a3099
----------------------------------------------------------------------