Re: trunk 'svn merge' takes a very long time to respond.
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 4 Dec 2012 13:53:21 +0000 (GMT)
Hyrum K Wright wrote:
> 'svn merge' appears to hang when running a simple merge:
Hi Hyrum. I don't know if you're seeing a network/server problem or a client inefficiency or a bit of both. I have been thinking two things about the client merge code though:
* It would be good to insert some feedback about what it's doing in the time before it starts making local changes, to give the user a more pleasant experience during a large merge.
* I know there is room for optimization: at the moment, for example, I believe it calculates the youngest common ancestor of the two branches more than once (contacting the repository each time).
I'll see if I can reproduce a "large" merge scenario where the start-up time is significant, and work out where the main bottleneck is.
For your particular case, can you tell me what branch at what revision your merge target was?
> I don't know enough about what's going on under the hood, but it
It could easily be the server (or the network at the server end) that's responding slowly.
> Running it again, I start to get a response after 7 minutes.
This is an archived mail posted to the Subversion Dev mailing list.