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

RE: 1+ hours to merge, can you beat that?

From: Roman Korchagin <roman.korchagin_at_aspose.com>
Date: Sun, 11 Oct 2009 00:47:38 +1300

Thanks to your replies. To summarize, so far I see two suggestions, but
unfortunately none apply here.


1. Slow because it is an i/o intensive task.

I can tell that the client i/o is definitely not stressed. The antivirus is
off. The disk is idling basically. Performance monitor shows nothing worth a
notice. The server is idling too.


2. Lots of nodes svn:mergeinfo will slow things down.

We only have svn:mergeinfo at the branch root and in this test we merge from
the trunk head to the branch head and the difference is not big.


So I have a trunk and a branch. I have merged once from the trunk to the
branch locally and since then the trunk has gone further, but not much. Only
about 20 changed source code files.


The difference between the branch and the trunk is also not big, about 30
files. All operations except merge work just fine. Even switching back and
forth between the trunk and the branch is quite fast, it takes less than a
minute. But merge is just impossible to use. I would tend to think this is
just a bug, some locking issue maybe. Or the protocol is too chatty?


I am now going to switch from HTTPS to HTTP to try and peek inside the
packages. Anybody can give me heads up of what info is actually supposed to
be exchanged during merge?






From: Bob Archer [mailto:Bob.Archer_at_amsi.com]
Sent: Saturday, October 10, 2009 2: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 for what?


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

>HTTPS protocol.


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




To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-10 13:48:58 CEST

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