[Monotone-commits-diffs] Revision 1f18b8c57a21200b1de7cc9db4588fb50b3e4f94

[monotone]

-----------------------------------------------------------------
Revision: 1f18b8c57a21200b1de7cc9db4588fb50b3e4f94
Ancestor: 774b2d041536fd47832d7f844688061791847295
Ancestor: 7c92c47ff1b572cc27a0aa6aa740c3a2a8bae976
Author: address@hidden
Date: 08/11/10 15:32:09
Branch: net.venge.monotone.colored-diff

Added files:
        automate_stdio_helpers.hh colorizer.cc colorizer.hh
        date_format.hh option_reset_info.hh options_applicator.cc
        options_applicator.hh
        tests/cancelled_arguments/__driver__.lua
        tests/complete_option_names/__driver__.lua
Added directories:
        tests/cancelled_arguments tests/complete_option_names
Modified files:
        Makefile.am NEWS annotate.cc app_state.hh asciik.cc
        asciik.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 diff_output.cc
        diff_output.hh 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 rev_output.cc rev_output.hh
        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: 

propagate from branch 'net.venge.monotone' (head 
774b2d041536fd47832d7f844688061791847295)
            to branch 'net.venge.monotone.colored-diff' (head 
7c92c47ff1b572cc27a0aa6aa740c3a2a8bae976)


monotone --db={your.database} diff 
--revision=774b2d041536fd47832d7f844688061791847295 
--revision=1f18b8c57a21200b1de7cc9db4588fb50b3e4f94
monotone --db={your.database} diff 
--revision=7c92c47ff1b572cc27a0aa6aa740c3a2a8bae976 
--revision=1f18b8c57a21200b1de7cc9db4588fb50b3e4f94
----------------------------------------------------------------------