[Monotone-commits-nodiffs] Revision f42a8b5242b2863a413fb68cade474c49fae1790

[monotone]

-----------------------------------------------------------------
Revision: f42a8b5242b2863a413fb68cade474c49fae1790
Ancestor: 7b3a6be6ed783be2973ee26f5ecf9fd85d67a8af
Ancestor: bbc159da431f3cf4175ec1c6d4812f80f882cfe4
Author: address@hidden
Date: 07/05/10 19:04:14
Branch: net.venge.monotone.tkoskine.disapprove-multirev

Added files:
        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
        tests/trust_hooks_and_trusted_command/hooks.lua
Added directories:
        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 NEWS automate.cc cmd_key_cert.cc cmd_ws_commit.cc
        contrib/mtn_makepermissions merge_conflict.cc monotone.texi
        network/connection_info.cc paths.cc paths.hh selectors.cc
        selectors.hh tests/test_hooks.lua
        tests/trust_hooks_and_trusted_command/__driver__.lua work.cc

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
7b3a6be6ed783be2973ee26f5ecf9fd85d67a8af)
            to branch 'net.venge.monotone.tkoskine.disapprove-multirev' (head 
bbc159da431f3cf4175ec1c6d4812f80f882cfe4)


monotone --db={your.database} diff 
--revision=7b3a6be6ed783be2973ee26f5ecf9fd85d67a8af 
--revision=f42a8b5242b2863a413fb68cade474c49fae1790
monotone --db={your.database} diff 
--revision=bbc159da431f3cf4175ec1c6d4812f80f882cfe4 
--revision=f42a8b5242b2863a413fb68cade474c49fae1790
----------------------------------------------------------------------