[Monotone-commits-nodiffs] Revision 5958625a9d8ff397a248edaedc81bfbbf5868677

[monotone]

-----------------------------------------------------------------
Revision: 5958625a9d8ff397a248edaedc81bfbbf5868677
Ancestor: 3ac2b9893575218ca2f8c16625412f05d36bae5c
Ancestor: 478e9b6dadd6d3711552857ed9ab515a0100ce27
Author: Timothy Brownawell  <address@hidden>
Date: 2010-06-14 00.11.19
Branch: net.venge.monotone.options

Added files:
        automate_stdio_helpers.hh option_reset_info.hh
        options_applicator.cc options_applicator.hh
        tests/cancelled_arguments/__driver__.lua
Added directories:
        tests/cancelled_arguments
Modified files:
        INSTALL Makefile.am NEWS app_state.hh automate.cc cmd.cc
        cmd.hh cmd_automate.cc cmd_diff_log.cc cmd_key_cert.cc
        cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc commands.hh
        key_store.cc lua-testsuite.lua lua_hooks.cc lua_hooks.hh
        maybe_workspace_updater.cc monotone.cc
        network/automate_session.cc option.cc option.hh options.cc
        options.hh options_list.hh sanity.cc sanity.hh std_hooks.lua
        tests/changelog_editor/__driver__.lua
        tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc ui.cc ui.hh unit-tests/dates.cc
        work.cc

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
478e9b6dadd6d3711552857ed9ab515a0100ce27)
            to branch 'net.venge.monotone.options' (head 
3ac2b9893575218ca2f8c16625412f05d36bae5c)


monotone --db={your.database} diff 
--revision=3ac2b9893575218ca2f8c16625412f05d36bae5c 
--revision=5958625a9d8ff397a248edaedc81bfbbf5868677
monotone --db={your.database} diff 
--revision=478e9b6dadd6d3711552857ed9ab515a0100ce27 
--revision=5958625a9d8ff397a248edaedc81bfbbf5868677
----------------------------------------------------------------------