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

Re: Merging Branch to Trunk takes 20 min for one change

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 10 Oct 2009 20:19:25 +0200

On 10.10.2009 19:51, Dadeo wrote:
> Thanks Stefan, you have been very helpful. It is reassuring to know
> that the problem is not anything we have done in the restructuring.
>
> I will contact Google regarding our merging problems as you suggested.
>
> Regarding the speed issue:
>
> We always update before merging. So that is not the problem.
>
>> When merging, it is recommended that you do all merges always from the
>> root of your working copy, not just from a subfolder or even a single
>> file. While the latter is possible and works fine, it will make
>> subsequent merges slower.
>>
> To make sure I undestand you correctly. You are saying that I always
> should select the root in my WC when merging. Then I select the
> revisions that apply only to the branch and folder I wish to merge. Is
> that what you mean?
>
> If so, then why do merges from our apps folders only take a few
> seconds while merges from our /skin folder take 20 minutes?

Sorry, it's not really that you should always merge from the root of the
wc. The point is that you should always merge from the same folder of
your wc - and that's usually the wc root.
If however you always merge from your /skin folder, then you should keep
doing that. The mergeinfo properties are set according to the folder
you're merging from, so if you always do it from the same folder, those
properties help speed up the merging a lot. However if you merge from
many different folders, those properties can't help you a lot to speed
up the process - they still help, but the merging has to ask the
repository for every folder that hasn't the full mergeinfo properties.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2406122
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-10 20:19:39 CEST

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