[Monotone-commits-nodiffs] Revision 82cb7b6ea775d44a992fafa1476dca28719820ca

[monotone]

-----------------------------------------------------------------
Revision: 82cb7b6ea775d44a992fafa1476dca28719820ca
Ancestor: 2a9d21f5872417c6ffd3c76e877f5ee69de37033
Ancestor: f96c287ccface2cb83b381e43c0087521e9ccc0d
Author: Timothy Brownawell  <address@hidden>
Date: 07/08/10 03:58:28
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/automate_log/__driver__.lua
        tests/cancelled_arguments/__driver__.lua
        tests/disapproving_of_a_merge_revision/__driver__.lua
        tests/disapproving_of_a_merge_revision/badfile
        tests/disapproving_of_a_merge_revision/badfile2
        tests/disapproving_of_a_merge_revision/goodfile
        tests/disapproving_of_a_merge_revision/rootfile
        tests/disapproving_of_a_revision_range/__driver__.lua
        tests/disapproving_of_a_revision_range/badfile
        tests/disapproving_of_a_revision_range/badfile2
        tests/disapproving_of_a_revision_range/finalfile
        tests/disapproving_of_a_revision_range/goodfile
        tests/disapproving_of_a_revision_range/rootfile
        tests/disapproving_of_a_revision_range/updatefile
        tests/disapproving_of_bad_revision_range/__driver__.lua
        tests/rename_warns_on_subdir_move/__driver__.lua
Added directories:
        tests/automate_log tests/cancelled_arguments
        tests/disapproving_of_a_merge_revision
        tests/disapproving_of_a_revision_range
        tests/disapproving_of_bad_revision_range
        tests/rename_warns_on_subdir_move
Modified files:
        INSTALL 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 database.cc key_store.cc
        lua-testsuite.lua lua_hooks.cc lua_hooks.hh
        maybe_workspace_updater.cc merge_conflict.cc monotone.cc
        monotone.texi network/automate_session.cc
        notes/release-checklist.txt option.cc option.hh options.cc
        options.hh options_list.hh paths.cc paths.hh po/it.po
        project.cc sanity.cc sanity.hh testlib.lua
        tests/common/automate_ancestry.lua
        tests/common/automate_stdio.lua
        tests/default_command_options/__driver__.lua
        tests/default_command_options/default_options.lua
        tests/test_the_version_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: 

merge in mainline changes


monotone --db={your.database} diff 
--revision=2a9d21f5872417c6ffd3c76e877f5ee69de37033 
--revision=82cb7b6ea775d44a992fafa1476dca28719820ca
monotone --db={your.database} diff 
--revision=f96c287ccface2cb83b381e43c0087521e9ccc0d 
--revision=82cb7b6ea775d44a992fafa1476dca28719820ca
----------------------------------------------------------------------