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

Re: Problems with merging against 1.4.x repository

From: Kari Grano <kari.grano_at_gmail.com>
Date: Mon, 16 Jun 2008 00:43:30 +0300

Hi Stefan,

>> Approach 3: TSVN 1.5-RC3 (32-bit)
>> - run merge wizard, first merge style option
>> - enter revision range with "Show Log" button, paint range "10142-10451"
>> - otherwise accept defaults (click "non-interactive" immediately when the

>> merge starts)
>>
>> Result 3:
>> - merge window reports every merge subrange (there are about 60
subranges)
>> - individual merges very slow
>> - after 27 submerges, the merge got confused: it *restarted* with the
second
>> subrange (r10145-10146; the first subrange is 10141-10142). This of
course
>> resulted in conflicts for every repeated submerge.
>> - finally, after 14 re-applied submerges the merge failed with error
>> Error: In directory 'd:\va88\uit\libs'
>> 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
>>
>> So I think there are two issues: a) general slowness problem when
compared
>> with the CL client b) correctness problem when there are many subranges
>> within the merge.
>>
>> I will later try the multiple-subrange merge with the CL client, if
>> possible.
>
> That would be great if you could test your multiple-subrange merge with
> the CL client. I suspect a bug in the svn library there which causes the
> double merges.

I ran the subrange test with the command-line client. The merging was
noticeably slower, and about 5 minutes it ended in the same error as above.
The only difference was that the command-line version did not restart the
merge; instead, it failed right after the 27th submerge. Maybe TSVN is
trying some other merge approach when failing, causing the restart?

I've reported the problem to the SVN dev list.

> And can you please try the next nightly build (>= 13275)? TSVN should
> now be as fast as the CL client.

Will do. Might to couple of days, as I'm occupied with other things
tomorrow.

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-16 07:08:06 CEST

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