[Monotone-commits-diffs] Revision e3880abe7ec08cf7a8c36c19e528bf71f57398de

[monotone]

-----------------------------------------------------------------
Revision: e3880abe7ec08cf7a8c36c19e528bf71f57398de
Ancestor: 72b2798408cd0fb6bbcbf33e71d3516a0fb77e5c
Ancestor: 79ac4b77d53f5827377ea076be0f3985ab0b3cdb
Author: address@hidden
Date: 04/11/10 21:59:10
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 merge_content.cc
        merge_content.hh monotone.texi network/reactor.cc
        tests/empty_environment/__driver__.lua
        tests/netsync_over_pipes/__driver__.lua

ChangeLog: 

merge of '72b2798408cd0fb6bbcbf33e71d3516a0fb77e5c'
     and '79ac4b77d53f5827377ea076be0f3985ab0b3cdb'


monotone --db={your.database} diff 
--revision=72b2798408cd0fb6bbcbf33e71d3516a0fb77e5c 
--revision=e3880abe7ec08cf7a8c36c19e528bf71f57398de
monotone --db={your.database} diff 
--revision=79ac4b77d53f5827377ea076be0f3985ab0b3cdb 
--revision=e3880abe7ec08cf7a8c36c19e528bf71f57398de
----------------------------------------------------------------------