[Monotone-commits-diffs] Revision a9faf42151c1f8588b2b51a6e43a147bcc44202b

[monotone]

-----------------------------------------------------------------
Revision: a9faf42151c1f8588b2b51a6e43a147bcc44202b
Ancestor: 5ac1f3e062119352c44ade08b66ce641b9cf8cee
Ancestor: 78f4db157a353de19b33df875959efc2492812b4
Author: Timothy Brownawell  <address@hidden>
Date: 07/28/10 04:37:19
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
Added directories:
        tests/cancelled_arguments
Modified files:
        Makefile.am NEWS annotate.cc app_state.hh automate.cc
        base.hh 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 key_store.cc
        keys.cc lua-testsuite.lua lua_hooks.cc lua_hooks.hh
        m4/numeric_vocab.m4 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 tests/date_formatting/__driver__.lua
        tests/default_command_options/__driver__.lua
        tests/default_command_options/default_options.lua
        tests/fail_cleanly_on_unreadable_db/__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=5ac1f3e062119352c44ade08b66ce641b9cf8cee 
--revision=a9faf42151c1f8588b2b51a6e43a147bcc44202b
monotone --db={your.database} diff 
--revision=78f4db157a353de19b33df875959efc2492812b4 
--revision=a9faf42151c1f8588b2b51a6e43a147bcc44202b
----------------------------------------------------------------------