[Monotone-commits-diffs] Revision d20b1964dbabf6d95e337c31976aae0e4d569a5b

[monotone]

-----------------------------------------------------------------
Revision: d20b1964dbabf6d95e337c31976aae0e4d569a5b
Ancestor: 5f00cba58b8c3feb72d6de28e94610a42e30465b
Ancestor: e381b9b84259d2f43f239fa2acbd9fa32d1cf301
Author: address@hidden
Date: 2010-04-18 21.10.47
Branch: net.venge.monotone

Added files:
        tests/automate_update/__driver__.lua
        tests/change_workspace/__driver__.lua
        tests/change_workspace/test_hooks.lua
        tests/netsync_per_server_defaults/__driver__.lua
        tests/unchanged_options_preserves_mtime/__driver__.lua
Added directories:
        tests/automate_update tests/change_workspace
        tests/netsync_per_server_defaults
        tests/unchanged_options_preserves_mtime
Modified files:
        INSTALL NEWS cmd_automate.cc cmd_merging.cc cmd_netsync.cc
        contrib/Monotone.pm merge_content.cc merge_content.hh
        monotone.texi network/reactor.cc paths.hh po/de.po po/es.po
        po/fr.po po/it.po po/ja.po po/pt.po po/pt_BR.po po/sv.po
        std_hooks.lua tests/common/netsync-hooks.lua
        tests/empty_environment/__driver__.lua
        tests/move_conflicting_unversioned/__driver__.lua
        tests/netsync_default_server_pattern/__driver__.lua
        tests/netsync_over_pipes/__driver__.lua
        tests/serve-automate/__driver__.lua
        tests/serve-automate-single-run/__driver__.lua work.cc

ChangeLog: 

merge of '5f00cba58b8c3feb72d6de28e94610a42e30465b'
     and 'e381b9b84259d2f43f239fa2acbd9fa32d1cf301'


monotone --db={your.database} diff 
--revision=5f00cba58b8c3feb72d6de28e94610a42e30465b 
--revision=d20b1964dbabf6d95e337c31976aae0e4d569a5b
monotone --db={your.database} diff 
--revision=e381b9b84259d2f43f239fa2acbd9fa32d1cf301 
--revision=d20b1964dbabf6d95e337c31976aae0e4d569a5b
----------------------------------------------------------------------