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

RE: Slow merging of selected revisions

From: Edward Ned Harvey <svn_at_nedharvey.com>
Date: Thu, 8 Jul 2010 07:59:51 -0400

> From: emerson [mailto:echofloripa.yell_at_gmail.com]
>
> Even dry-run sometimes takes more than 30 minutes to process one single
> file.
>
> We are using the "svn merge http://[repo] -c 333" command syntax.
>
> Our server is 1.4.4, and we are using 1.6.x clients.

I believe we found the root cause of this problem. Please see this thread:
(start) http://svn.haxx.se/dev/archive-2010-07/0040.shtml
(middle) http://svn.haxx.se/dev/archive-2010-07/0101.shtml
(end) http://svn.haxx.se/dev/archive-2010-07/0122.shtml

The solution seems to be:

Upgrade your server to 1.6.
Upgrade your clients to 1.6.
and
Even though they say you shouldn't need this, dump & load your repo to
upgrade it to 1.6. If you don't do this, the old revs which are slow in
your repo will always remain slow. Moving forward, eventually you'll stop
seeing the problem on a regular basis, as you begin using more and more
consistently, just revs which were committed with 1.6. But the commit
algorithm doesn't always diff against rev n-1, sometimes it diffs against
rev n/2, which means ... Unless you do the dump & load, the problem will
never entirely go away.

The dump & load will take a really long time. Because it will
systematically step on every single one of the bad revs.
Received on 2010-07-08 14:00:59 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.