Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > multiple tree-conflicts during merge -- was: Re: Error reading spooled REPORT request response

subversion
Discussion topic

Back to topic list

multiple tree-conflicts during merge -- was: Re: Error reading spooled REPORT request response

Author neels
Full name Neels Janosch Hofmeyr
Date 2009-06-05 10:15:18 PDT
Message Neels Janosch Hofmeyr wrote:
> Wilfredo Sánchez Vega wrote:
>> 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
>
> Hmm, looks like a solid bug. Investigating...

BTW, I successfully reproduced this issue.
In case you're interested, it's because a deletion and addition happen in
one merge range, onto a file that was also modified in the target branch. To
work around it, you could merge selected ranges and resolve tree-conflicts
after each range.

But to find out which files and ranges are involved is not that simple. I've
also been thinking about that one and might come up with a little tool soon.

Anyway. I'm still struggling to find the proper fix for this issue, in *theory*.

How to handle multiple tree-conflicts within a given merge range? i.e. in
a given range, file alpha was removed, later added, later removed again. I'm
merging that onto another branch that has modified file alpha. For further
argument, make the "later added" an "added-with-history", so that it is
again the "exact same" file with history and all.

What do I want to see -- The first delete? The last delete? Only the "arch"
over all consecutive delete/add/delete/add operations? (As in, if the last
one was an add, process an edit, if the last one was a delete, process a
delete?)

What should `svn info' show -- the merge range given on the command line?
The revision number that tried to delete the file (whih one)?

I'm still pretty uncertain about that stuff.


My reproduction script is attached.
In the script, also note that passing the file in question as an explicit
target (instead of recursing on the parent dir) totally fails to see a
tree-conflict in the first place. It's as if the merge lost its voice.

If I don't come up with an idea soon, I'll make this a new issue.

~Neels


> Thanks for the report! So you got my message on IRC ;)
> I'll be back later, hopefully with a fix.
>
> ~Neels
>
>> 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)";
>>
>> --------------------​--------------------​--------------
>> http://subversion.ti​gris.org/ds/viewMess​age.do?dsForumId=462​&dsMessageId=235​9252
>
> --------------------​--------------------​--------------
> http://subversion.ti​gris.org/ds/viewMess​age.do?dsForumId=462​&dsMessageId=235​9433
Attachments

« Previous message in topic | 3 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: