[Monotone-commits-diffs] Revision 1bef589f8d315d6cc91a384bcba36ce196aa3b31

[monotone]

-----------------------------------------------------------------
Revision: 1bef589f8d315d6cc91a384bcba36ce196aa3b31
Ancestor: 8b38c089e7a11ef78e4ebb332b5d7d8c5cfb0eea
Ancestor: a64936c4619c7ecfc880de8ca53588f7624ddcff
Author: address@hidden
Date: 05/09/10 13:18:09
Branch: net.venge.monotone

Added files:
        tests/log_recognizes_invalid_workspace_parent/__driver__.lua
Added directories:
        tests/log_recognizes_invalid_workspace_parent
Modified files:
        NEWS win32/main.cc

ChangeLog: 

merge of '8b38c089e7a11ef78e4ebb332b5d7d8c5cfb0eea'
     and 'a64936c4619c7ecfc880de8ca53588f7624ddcff'




monotone --db={your.database} diff 
--revision=8b38c089e7a11ef78e4ebb332b5d7d8c5cfb0eea 
--revision=1bef589f8d315d6cc91a384bcba36ce196aa3b31
monotone --db={your.database} diff 
--revision=a64936c4619c7ecfc880de8ca53588f7624ddcff 
--revision=1bef589f8d315d6cc91a384bcba36ce196aa3b31
----------------------------------------------------------------------