Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Error reading spooled REPORT request response

subversion
Discussion topic

Back to topic list

Error reading spooled REPORT request response

Author Wilfredo Sánchez Vega <wsanchez at wsanchez dot net>
Full name Wilfredo Sánchez Vega <wsanchez at wsanchez dot net>
Date 2009-06-03 16:06:07 PDT
Message 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.calendars​erver.org/repository​/calendarserver/Cale​ndarServer/trunk
  CalendarServer;
cd CalendarServer;

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

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

« Previous message in topic | 1 of 6 | Next message in topic »

Messages

Show all messages in topic

Error reading spooled REPORT request response Wilfredo Sánchez Vega <wsanchez at wsanchez dot net> Wilfredo Sánchez Vega <wsanchez at wsanchez dot net> 2009-06-03 16:06:07 PDT
     Re: Error reading spooled REPORT request response neels Neels Janosch Hofmeyr 2009-06-04 06:35:32 PDT
         multiple tree-conflicts during merge -- was: Re: Error reading spooled REPORT request response neels Neels Janosch Hofmeyr 2009-06-05 10:15:18 PDT
             Re: multiple tree-conflicts during merge -- was: Re: Error reading spooled REPORT request response neels Neels Janosch Hofmeyr 2009-06-11 16:23:09 PDT
                 RE: Re: multiple tree-conflicts during merge -- was: Re: Error reading spooled REPORT request response jawspeak Jonathan 2009-09-02 08:07:42 PDT
                     Re: Re: multiple tree-conflicts during merge -- was: Re: Error reading spooled REPORT request response stsp Stefan Sperling 2009-09-02 08:37:34 PDT
Messages per page: