From: Bob Archer [mailto:bob.archer_at_amsi.com]
Sent: Friday, October 09, 2009 7:42 AM
To: Roman Korchagin; users_at_subversion.tigris.org
Subject: RE: 1+ hours to merge, can you beat that?
>But we are seeing 6 minutes to merge small changes in 20 files or so
(30 seconds per file?). There are no large directories, just a normal
project >approx 1500 source code files, no more than 50 per directory.
In the packer analyzer I've got only 1.2MB of traffic in 2,316 packets.
Could not look >into them because they are HTTPS. The network graph is
around 20Kbps. The server appears to be idle in everything. The client
is not stressed >either. Ping is 551ms if that helps. Both are waiting
>With a bit more changes between revisions we are easily hitting 1 hour
or more to do a merge or integration...
>Any help is greatly appreciated.
>Server is VisualSVN Server Manager 2.0.7
>Client is TortoiseSVN 1.6.5
>Server and client are Windows obviously.
Given you are on Windows... are you running any type of Virus scan
software? If so, you should set it to exclude your working copies. On
access scanning will really slow down svn when you are doing such an i/o
I can confirm that merges probably take a long time under Windows no
matter what you do. My virus scanner excludes my working copies. I
periodically use MyDefrag to defragment and optimize my hard drive. I
even prevent System Restore from looking at my working copies-and I
personally suspect one of the biggest slowdowns you can get is for
System Restore to save old images of all your working copy files every
time Svn touches its .svn directory metadata.
Even with all this done, a merge of just a few files can easily take
10-30 minutes whereas an update takes more like 1-6 minutes usually. It
is faster if I only merge the necessary directories, instead of the root
of my working copy, but until we have Svn 1.7 I will prefer that any
mergeinfo I generate be that of the WC root.
I see this with 1.6.x clients (1.6.5 for me) and 1.5.2 server. I don't
know if Roman has such an optimized client, or whether he has done
something to slow down merging like having switched subtrees or not
having the entire WC at the same BASE revision. Even so, I do all this,
and merging still seems dog slow relative to what it is doing. I hope
that 1.7 speeds all this up. I will add that I upgraded our test server
to 1.6.5 and it didn't make a merge run "fast" to my eyes. I'm sure it
was probably faster than 1.5.2, but it wasn't the order-of-magnitude
speedup I would like to hope for.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-09 17:38:07 CEST