[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 18:16:51 +0200

On 09.10.2009 23:08, Dadeo wrote:

> When I look at merge properties for the files in trunk/skin that show
> as modified in my last merge (not yet committed to repository) they
> show:
> “s v n : m e r g e i n f o T /branches/2.1/common.dialog.xml:402-635/
> branches/3.1/skin/common.dialog.xml:707-730”

So the mergeinfo properties are still there.

> Of course, /branches/2.1 no longer exists - could that be our
> problem? Since every file now has it in the mergeinfo properties. If
> so, how do we correct this now?

That shouldn't be a problem.

>> There's also a thread about the same issue on the svn mailing list:http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessa...
>>
> Yes, that thread looks very similar to our problem. But I don't really
> understand the answer :). How do we "run svn up before you merge". And

Just update your working copy (use the "update" command in TSVN).

> how do I have my "working copy at a single revision, and perhaps even
> at HEAD"? And how do I "check your working copy for subtree

That's what an update does - it updates the working copy to the HEAD
revision.

> mergeinfo" How do I get all my mergeinfo at the tree root as
> recommended in that post?

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.

> I did try to find these in the Help file, but perhaps the terminology
> is different? I am happy to research and learn if you can just point
> me in the right direction.

Maybe you should ask on the code hosting group:
http://groups.google.com/group/google-code-hosting?pli=1

Google code has its own implementation of the svn repository, using
their bigtable system. So it might be an issue with that. Even if it's
not, the guys who run the Google code hosting (and implemented it) are
svn developers (some former, some are still active) so they know a *lot*
about the internals of Subversion.

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=2405901
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-10 18:17:00 CEST

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