[Monotone-commits-diffs] Revision 2d83b8d3d809d87033533bb906e2ac7092e21a12

[monotone]

-----------------------------------------------------------------
Revision: 2d83b8d3d809d87033533bb906e2ac7092e21a12
Ancestor: 30f1aef37fbc989bccdd3d81c53375a4628ecde2
Ancestor: b01701dd8983681a204cdafdfe296d6a288436d3
Author: Timothy Brownawell  <address@hidden>
Date: 08/11/10 14:36:00
Branch: net.venge.monotone

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/monoprof.sh
        contrib/monotone-notify-hookversion.lua
        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/basic_invocation_and_options/__driver__.lua
        tests/commit_use_workspace_keydir/__driver__.lua
        tests/creating_a_bad_criss-cross_merge/__driver__.lua
        tests/date_formatting/__driver__.lua
        tests/default_command_options/__driver__.lua
        tests/default_command_options/default_options.lua
        tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/netsync_negotiation/__driver__.lua
        tests/non_workspace_keydir/__driver__.lua
        tests/reallyquiet_turns_off_tickers_and_warnings/__driver__.lua
        tests/short_options_work_correctly/__driver__.lua
        tests/ssh_agent/__driver__.lua
        tests/subdirectory_restrictions/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc
        tests/verification_of_command_line_options/__driver__.lua
        ui.cc ui.hh unix/main.cc win32/main.cc work.cc

ChangeLog: 

merge back nvm.options


monotone --db={your.database} diff 
--revision=30f1aef37fbc989bccdd3d81c53375a4628ecde2 
--revision=2d83b8d3d809d87033533bb906e2ac7092e21a12
monotone --db={your.database} diff 
--revision=b01701dd8983681a204cdafdfe296d6a288436d3 
--revision=2d83b8d3d809d87033533bb906e2ac7092e21a12
----------------------------------------------------------------------