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

Re: trunk 'svn merge' takes a very long time to respond.

From: Paul Burba <ptburba_at_gmail.com>
Date: Tue, 4 Dec 2012 10:45:40 -0500

On Tue, Dec 4, 2012 at 10:36 AM, Philip Martin
<philip.martin_at_wandisco.com> wrote:
> Mark Phippard <markphip_at_gmail.com> writes:
>
>> On Tue, Dec 4, 2012 at 10:05 AM, Hyrum K Wright <hyrum_at_hyrumwright.org> wrote:
>>
>>>> For your particular case, can you tell me what branch at what revision
>>>> your merge target was?
>>>
>>>
>>> The merge target was the ev2-export branch, which was probably most recently
>>> merged around 2-3 weeks ago, so it's not incredibly out-of-date. To
>>> reproduce, you could probably just back up the branch to before the most
>>> recent merge, and go from there.
>>
>> Using the current HEAD of that branch I can see the same problem.
>
> I don't see the problem when I use my local mirror or svn.eu.apache.org.

Hmmm. Removing the one piece of subtree mergeinfo speeds things up
considerably:

C:\SVN\src-branch-ev2-export>svn pd svn:mergeinfo
tools\dist\make-deps-tarball.sh
property 'svn:mergeinfo' deleted from 'tools\dist\make-deps-tarball.sh'.

C:\SVN\src-branch-ev2-export>timethis svn merge
https://svn.apache.org/repos/asf/subversion/trunk .

TimeThis : Command Line : svn merge
https://svn.apache.org/repos/asf/subversion/trunk .
TimeThis : Start Time : Tue Dec 04 10:43:48 2012

--- Merging r1416745 through r1416998 into '.':
U subversion\libsvn_wc\wc-queries.sql
U subversion\libsvn_wc\wc_db_update_move.c
--- Recording mergeinfo for merge of r1416745 through r1416998 into '.':
 U .

TimeThis : Command Line : svn merge
https://svn.apache.org/repos/asf/subversion/trunk .
TimeThis : Start Time : Tue Dec 04 10:43:48 2012
TimeThis : End Time : Tue Dec 04 10:43:56 2012
TimeThis : Elapsed Time : 00:00:07.541

-- 
Paul T. Burba
CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development
Skype: ptburba
Received on 2012-12-04 16:46:13 CET

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