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

Re: Choosing the revisions to merge is very slow

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 8 Oct 2015 18:48:08 +0200

On 08.10.2015 16:02, Michel TERRISSE wrote:
> Thank you for your messages
>
> Our server is already in version 1.9 (SlikSvn 1.9.2 64 bits).
>
> I could try all the combinations:
> TortoiseSvn 1.8 connected to SlikSvn 1.8 : immediate
> TortoiseSvn 1.8 connected to SlikSvn 1.9 : immediate
> TortoiseSvn 1.9 connected to SlikSvn 1.8 : long
> TortoiseSvn 1.9 connected to SlikSvn 1.9 : long
> and if I remove the mergeinfo property
> TortoiseSvn 1.8 connected to SlikSvn 1.8 : immediate
> TortoiseSvn 1.8 connected to SlikSvn 1.9 : immediate
> TortoiseSvn 1.9 connected to SlikSvn 1.8 : immediate
> TortoiseSvn 1.9 connected to SlikSvn 1.9 : immediate
>
> Could you tell me if the mergeinfo property is handled by
> TortoiseSvn
or by the svn library when I get the list of revisions to merge? I mean
who decides which line should be grayed or not?

That's the svn library. TSVN does nothing itself with the svn internals.

>
> Note that the command line svn mergeinfo svn://.../SCOLYS_26_0 takes
> the same time to execute if I remove the mergeinfo property or
not (about 25s today).
>
> I extracted to source code from
https://svn.code.sf.net/p/tortoisesvn/code/trunk, I will try to add
traces to understand what happens.

here's what's happening in TSVN when you show the log from the merge dialog:

* new thread is started, then another thread that checks the status of
the working copy (configurable via Settings->Advanced->LogStatusCheck)
* repository root and head revision are fetched from the repo
* svn_client_mergeinfo_log2() is executed to get the merge info
* if Settings->Advanced->LogFindCopyFrom is active, another 'svn log' is
executed with different settings to get the revision where the branch
was created from
* then finally the log is fetched

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=3141470
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-10-08 18:48:22 CEST

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