1+ hours to merge, can you beat that?

We have started using merge (because it supports merge tracking now) to work
more in the agile style, but we are finding that we cannot actually.

Checkout and switch are working very well. The data is flowing at a good
speed, let's say 200Kbps over the channel that we have.

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.

Cheers,

Roman

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2405528

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-09 15:23:39 CEST