[Monotone-commits-diffs] Revision 2a9d21f5872417c6ffd3c76e877f5ee69de37033

[monotone]

-----------------------------------------------------------------
Revision: 2a9d21f5872417c6ffd3c76e877f5ee69de37033
Ancestor: 3927077002a64e0c826af31bf44dfe37fe409ec4
Ancestor: 567daf5cca12afc596a9c449edc19febd4c39dc9
Author: Timothy Brownawell  <address@hidden>
Date: 07/01/10 05:31:27
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/annotate_ignores_untrusted_certs/__driver__.lua
        tests/annotate_ignores_untrusted_certs/all_untrusted.lua
        tests/annotate_ignores_untrusted_certs/author_untrusted.lua
        tests/annotate_ignores_untrusted_certs/date_untrusted.lua
        tests/cancelled_arguments/__driver__.lua
        tests/trust_hooks_and_trusted_command/hooks.lua
Added directories:
        tests/annotate_ignores_untrusted_certs
        tests/cancelled_arguments
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_key_cert.cc cmd_merging.cc cmd_netsync.cc
        cmd_ws_commit.cc commands.cc commands.hh
        contrib/monotone.bash_completion
        contrib/monotone.zsh_completion contrib/mtn_makepermissions
        database.cc key_store.cc lua-testsuite.lua lua_hooks.cc
        lua_hooks.hh maybe_workspace_updater.cc merge_conflict.cc
        monotone.cc network/automate_session.cc
        network/connection_info.cc option.cc option.hh options.cc
        options.hh options_list.hh project.cc sanity.cc sanity.hh
        selectors.cc selectors.hh
        tests/default_command_options/__driver__.lua
        tests/default_command_options/default_options.lua
        tests/import/__driver__.lua tests/test_hooks.lua
        tests/test_the_version_command/__driver__.lua
        tests/trust_hooks_and_trusted_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: 

propagate from branch 'net.venge.monotone' (head 
567daf5cca12afc596a9c449edc19febd4c39dc9)
            to branch 'net.venge.monotone.options' (head 
3927077002a64e0c826af31bf44dfe37fe409ec4)


monotone --db={your.database} diff 
--revision=3927077002a64e0c826af31bf44dfe37fe409ec4 
--revision=2a9d21f5872417c6ffd3c76e877f5ee69de37033
monotone --db={your.database} diff 
--revision=567daf5cca12afc596a9c449edc19febd4c39dc9 
--revision=2a9d21f5872417c6ffd3c76e877f5ee69de37033
----------------------------------------------------------------------