Error reading spooled REPORT request response

I'm running into this error while trying to do a merge:

        --- Merging r4130 through r4318 into '.':
        U lib-patches/Twisted/twisted.python.util.patch
        svn: Attempt to add tree conflict that already exists
        svn: Error reading spooled REPORT request response

   The client and server are both running svn version 1.6.2.

   This merge completes without errors if I use svn 1.4.4 client (had
that on another machine; didn't try anything in between), which
suggests that this is a regression.

   The script below will reproduce this on my system.

        -wsv

#!/usr/bin/env bash

# Create a temporary directory
tmp="$(mktemp -d -t foo)";
cd "${tmp}";

# Check out CalendarServer
svn co -r4315 http://svn.calendarserver.org/repository/calendarserver/CalendarServer/trunk
  CalendarServer;
cd CalendarServer;

# Merge all changes on the update-twisted-3816-3 since it's creation
(r4129)
svn merge -r4129:HEAD http://svn.calendarserver.org/repository/calendarserver/CalendarServer/branches/exarkun/update-twisted-3816-3
;

# Print the WC path
echo "WC is: $(pwd)";

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2359252
Received on 2009-06-04 02:37:09 CEST