It might be worth trying to back out those changes and apply them individually to see which breaks?
-- Terry Cox Meta-Concepts Ltd
The problem seems due to a failure in the merge/switch. The error
message is a bit obtuse, but seems to relate to switching to/from a
folder which doesn't exist.
