[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Strange merge behaviour with rc9

From: Kari Grano <kari.grano_at_gmail.com>
Date: Fri, 20 Jun 2008 20:08:09 +0300

On Thu, 19 Jun 2008 11:01:23 +0200 Jens Seidel wrote:

> I'm CC:ed you even if you did not requested it as parts of your mail was
> a few days ago discussed on this list. So I'm assume you're not
> subscribed and forgot to ask for CC:.

I'm using the haxx server to track the list. For some reason, I managed to
miss my initial mail there.

>> Specifically, it seems that the speed and outcome of
>>
>> svn merge --accept postpone -r A:B URL
>>
>> and
>>
>> svn merge --accept postpont -r A:A1 -r A2:A3 ... -r An:B URL

> -r A1:A2 is probably missing.

No - as I mentioned, the ranges are actually calculated by TSVN and reflect
correctly the history of 'URL'. Of course, TSVN could be wrong, but I
checked that this is not the case here.

>> I can somewhat understand the speed problem, but shouldn't the outcomes
of
>> the two commands be the same? The subranges in question represent all the

>> relevant revisions on URL, ie. there is no reverse cherry picking or
>> anything like that going on (in fact, the ranges have been obtained by
using
>> the TSVN log output for URL).

> I would expect this as well. Nevertheless it isn't true for additions,
> removals, ...
> See http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=139949

Thanks for the link. Very interesting thread. There may be good fundamental
reasons for this, but as an end user I'm surprised that there can be a
difference between

        svn merge -r2:4 URL

and

        svn merge -r2:3 -r3:4 URL

Is this really by design?

>> Error: Error processing command 'append' in 'd:\va88\uit\libs'
>> Error: Missing 'dest' attribute in 'd:\va88\uit\libs'
>> Error: Error reading spooled REPORT request response

> I haven't seen this up to now.

I managed to reproduce this with a test repo; see my response to Julian
Foad.

Thanks,
Kari

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-06-20 19:10:16 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.