[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: Fri, 20 Jun 2008 20:24:48 +0300

Kari Granö wrote:
> 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
> 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.

I managed to reproduce the problem with a small test repo which I just
reported to Subversion dev list (and also on this list, sorry!) It seems
that repeated merging of conflicting properties triggers the error. However,
now that TSVN squeezes the log output range during merge, the problem does
not occur so easily.

I also learned that sometimes -r1:2 -r2:3 can be different from -r2:4 in the
context of svn merge (see
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=139949). Also
because of this it is good that the range is squeezed by default.

>> 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.

I retested the merge with a recent nightly and can confirm that the speed is
now in par with the command-line client.

Thanks for your hard work on this!

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:46:00 CEST

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