[Monotone-commits-diffs] Revision 07cf8b86f92b52c3f137a6b1ea6536d8889846e5

[monotone]

-----------------------------------------------------------------
Revision: 07cf8b86f92b52c3f137a6b1ea6536d8889846e5
Ancestor: 31e517ffb42b594bcf921bfd97b6a4bb3910671d
Ancestor: 6a7525531f599b25260f9ee17509084b482982e1
Author: address@hidden
Date: 04/06/10 10:15:41
Branch: net.venge.monotone

Added files:
        tests/automate_update/__driver__.lua
        tests/change_workspace/__driver__.lua
        tests/change_workspace/test_hooks.lua
Added directories:
        tests/automate_update tests/change_workspace
Modified files:
        INSTALL NEWS cmd_automate.cc cmd_merging.cc
        contrib/Monotone.pm merge_content.cc merge_content.hh
        monotone.texi network/reactor.cc
        tests/netsync_over_pipes/__driver__.lua

ChangeLog: 

propagate from branch 'net.venge.monotone.stephe' (head 
6a7525531f599b25260f9ee17509084b482982e1)
            to branch 'net.venge.monotone' (head 
31e517ffb42b594bcf921bfd97b6a4bb3910671d)




monotone --db={your.database} diff 
--revision=31e517ffb42b594bcf921bfd97b6a4bb3910671d 
--revision=07cf8b86f92b52c3f137a6b1ea6536d8889846e5
monotone --db={your.database} diff 
--revision=6a7525531f599b25260f9ee17509084b482982e1 
--revision=07cf8b86f92b52c3f137a6b1ea6536d8889846e5
----------------------------------------------------------------------