[Monotone-commits-diffs] Revision 920186fc9972173be8686d099f12d3d0ad426291

[monotone]

-----------------------------------------------------------------
Revision: 920186fc9972173be8686d099f12d3d0ad426291
Ancestor: 904926cd8462db7743742a5c1d216245202813a7
Ancestor: a9af4cc9b3610b2180b10a050a613170f6b16bd9
Author: Timothy Brownawell  <address@hidden>
Date: 06/27/10 20:36:18
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
        tests/update_does_not_suggest_suspended_branches/__driver__.lua
Added directories:
        tests/cancelled_arguments
        tests/update_does_not_suggest_suspended_branches
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_packet.cc
        cmd_ws_commit.cc commands.cc commands.hh
        contrib/monotone.bash_completion
        contrib/monotone.zsh_completion database.cc key_store.cc
        lua-testsuite.lua lua_hooks.cc lua_hooks.hh
        maybe_workspace_updater.cc monotone.cc monotone.texi
        network/automate_session.cc option.cc option.hh options.cc
        options.hh options_list.hh project.cc sanity.cc sanity.hh
        tests/changelog_editor/__driver__.lua
        tests/changelog_editor/changelog.lua
        tests/default_command_options/__driver__.lua
        tests/default_command_options/default_options.lua
        tests/test_the_version_command/__driver__.lua
        tests/update_ignores_suspended_heads/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc texinfo.css ui.cc ui.hh
        unit-testsuite.lua unix/main.cc update.cc update.hh
        win32/main.cc work.cc

ChangeLog: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=904926cd8462db7743742a5c1d216245202813a7 
--revision=920186fc9972173be8686d099f12d3d0ad426291
monotone --db={your.database} diff 
--revision=a9af4cc9b3610b2180b10a050a613170f6b16bd9 
--revision=920186fc9972173be8686d099f12d3d0ad426291
----------------------------------------------------------------------