[Monotone-commits-diffs] Revision dab9738fd4dcd3dd63ff47d48c329121fb51ff22

[monotone]

-----------------------------------------------------------------
Revision: dab9738fd4dcd3dd63ff47d48c329121fb51ff22
Ancestor: b549070f1e2d6c550b118672048fe1aa8ad1d2a4
Ancestor: e1324a4f515691b89da79ac2d251b7f6d97c91be
Author: Richard Levitte <address@hidden>
Date: 2009-05-12T06:32:26
Branch: net.venge.monotone

Deleted entries:
        monotone.spec tests/spawn_redirected_hook_helper
        tests/spawn_redirected_hook_helper/__driver__.lua
        tests/spawn_redirected_hook_helper/testhooks
Added files:
        tester-tests/running_commands/__driver__.lua
        tester-tests/running_commands/script
        tests/exception-in-luaext/__driver__.lua
        tests/exception-in-luaext/evilrc.lua
        tests/update_loses_execute/__driver__.lua
        tests/w_selector/__driver__.lua
Added directories:
        tester-tests/running_commands tests/exception-in-luaext
        tests/update_loses_execute tests/w_selector
Modified files:
        INSTALL NEWS UPGRADE automate.cc charset.cc cmd_automate.cc
        cmd_list.cc cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc
        configure.ac contrib/monotone-mail-notify.sh database.cc
        key_store.cc key_store.hh keys.cc keys.hh lua.hh
        merge_conflict.cc merge_content.cc mkstemp.cc monotone.cc
        monotone.texi netsync.cc notes/release-checklist.txt
        po/de.po po/es.po po/sv.po project.cc sanity.cc sanity.hh
        selectors.cc std_hooks.lua testlib.lua
        tests/mtn_execute_attr_respects_umask/__driver__.lua
        tests/p_selector/__driver__.lua
        tests/quiet_turns_off_tickers_but_not_warnings/__driver__.lua
        tests/resolve_conflicts_content/update-1
        tests/resolve_conflicts_none/update-1 txt2c.cc ui.cc ui.hh
        unit-tests/roster.cc unit_tester.cc unix/process.cc
        visualc/config.h vocab.cc vocab.hh win32/monotone.iss
        work.cc work.hh

ChangeLog: 

merge of 'b549070f1e2d6c550b118672048fe1aa8ad1d2a4'
     and 'e1324a4f515691b89da79ac2d251b7f6d97c91be'


monotone --db={your.database} diff 
--revision=b549070f1e2d6c550b118672048fe1aa8ad1d2a4 
--revision=dab9738fd4dcd3dd63ff47d48c329121fb51ff22
monotone --db={your.database} diff 
--revision=e1324a4f515691b89da79ac2d251b7f6d97c91be 
--revision=dab9738fd4dcd3dd63ff47d48c329121fb51ff22
----------------------------------------------------------------------