[Monotone-commits-diffs] Revision d3b159572938edb928ede923442a6a4aa1c5c98c

[monotone]

-----------------------------------------------------------------
Revision: d3b159572938edb928ede923442a6a4aa1c5c98c
Ancestor: 567daf5cca12afc596a9c449edc19febd4c39dc9
Ancestor: 819cdf2fd99aee20da701bcce91c04c57804fc50
Author: address@hidden
Date: 07/03/10 17:12:55
Branch: net.venge.monotone

Added files:
        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/trust_hooks_and_trusted_command/hooks.lua
        tests/update_does_not_suggest_suspended_branches/__driver__.lua
Added directories:
        tests/annotate_ignores_untrusted_certs
        tests/update_does_not_suggest_suspended_branches
Modified files:
        INSTALL NEWS annotate.cc automate.cc cmd_key_cert.cc
        cmd_merging.cc cmd_ws_commit.cc contrib/mtn_makepermissions
        merge_conflict.cc monotone.texi network/connection_info.cc
        selectors.cc selectors.hh
        tests/changelog_editor/__driver__.lua
        tests/changelog_editor/changelog.lua
        tests/import/__driver__.lua tests/test_hooks.lua
        tests/trust_hooks_and_trusted_command/__driver__.lua
        tests/update_ignores_suspended_heads/__driver__.lua
        texinfo.css update.cc update.hh

ChangeLog: 

merge of '567daf5cca12afc596a9c449edc19febd4c39dc9'
     and '819cdf2fd99aee20da701bcce91c04c57804fc50'


monotone --db={your.database} diff 
--revision=567daf5cca12afc596a9c449edc19febd4c39dc9 
--revision=d3b159572938edb928ede923442a6a4aa1c5c98c
monotone --db={your.database} diff 
--revision=819cdf2fd99aee20da701bcce91c04c57804fc50 
--revision=d3b159572938edb928ede923442a6a4aa1c5c98c
----------------------------------------------------------------------