[Monotone-commits-diffs] Revision 262081957fffe7c10e2a31a92f2fc14d3b43eac3

[monotone]

-----------------------------------------------------------------
Revision: 262081957fffe7c10e2a31a92f2fc14d3b43eac3
Ancestor: 3a6eaf635f8f0152db543db6391edd596b2ee73e
Ancestor: 7dee6fb62451e8907e795acf1c86d1ee7b7cd5ae
Author: address@hidden
Date: 05/15/10 19:47:01
Branch: net.venge.monotone

Renamed entries:
        tests/commit_using__MTN_log/commit_log.lua to 
tests/commit_using__MTN_log/commit_cancelled.lua
        tests/commit_using__MTN_log/commit_log_modified_return.lua to 
tests/commit_using__MTN_log/commit_confirmed.lua
Added files:
        rev_output.cc rev_output.hh
        tests/changelog_editor/__driver__.lua
        tests/changelog_editor/changelog.lua
        tests/db_check_branch_leaves/__driver__.lua
Added directories:
        tests/changelog_editor tests/db_check_branch_leaves
Modified files:
        Makefile.am NEWS cmd_diff_log.cc cmd_key_cert.cc
        cmd_ws_commit.cc contrib/edit_comment_from_changelog.lua
        database.cc database.hh database_check.cc dates.cc dates.hh
        keys.cc keys.hh lua_hooks.cc lua_hooks.hh
        migrate_ancestry.cc monotone.texi simplestring_xform.cc
        simplestring_xform.hh std_hooks.lua
        tests/_--author,_--date/__driver__.lua
        
tests/_MTN_files_handled_correctly_in_aborted_commit/bad_edit_comment.lua
        tests/checkout_creates__MTN_log/commit_log.lua
        tests/clone_creates__MTN_log/commit_log.lua
        tests/commit_default_editor/test_hooks.lua
        tests/commit_using__MTN_log/__driver__.lua
        tests/commit_using__MTN_log/commit_cancelled.lua
        tests/commit_using__MTN_log/commit_confirmed.lua
        tests/commit_using__MTN_log_and_--message/commit_log.lua
        tests/commit_validation_lua_hook/errmsg
        tests/commit_with_--message-file/commit_log.lua
        tests/commit_writes_message_back_to__MTN_log/__driver__.lua
        tests/commit_writes_message_back_to__MTN_log/my_hook.lua
        tests/git_export/__driver__.lua
        tests/i18n_commit_messages/__driver__.lua
        tests/i18n_commit_messages/euc-jp.txt
        tests/i18n_commit_messages/extra_hooks.lua
        tests/i18n_commit_messages/utf8.txt
        tests/importing_cvs_metadata/expected_log_output
        tests/merge_into_workspace/expected-log
        tests/merge_into_workspace/expected-log-left
        unit-tests/dates.cc unit-tests/simplestring_xform.cc work.cc
        work.hh

ChangeLog: 

merge of '3a6eaf635f8f0152db543db6391edd596b2ee73e'
     and '7dee6fb62451e8907e795acf1c86d1ee7b7cd5ae'


monotone --db={your.database} diff 
--revision=3a6eaf635f8f0152db543db6391edd596b2ee73e 
--revision=262081957fffe7c10e2a31a92f2fc14d3b43eac3
monotone --db={your.database} diff 
--revision=7dee6fb62451e8907e795acf1c86d1ee7b7cd5ae 
--revision=262081957fffe7c10e2a31a92f2fc14d3b43eac3
----------------------------------------------------------------------