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

Re: Merging with sparse checkouts

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 18 Mar 2009 17:44:51 +0100

Kari Granö wrote:
> Hi,
> Recently I've bumped into a strange problem with sparse checkouts and merge
> tracking. When TSVN branched for 1.6.x, I needed a working copy for the
> branch. Since I'm only doing 1.6.x translations, I decided to do a sparse
> checkout for the 1.6.x tree:
> 1.6.x (immediate children + folders)
> |
> +-- doc (fully recursive)
> |
> +-- Languages (fully recursive)
> This works nicely with respect to updates and has small footprint. Good.
> However, I'm having problems when merging stuff from /trunk to my sparse
> 1.6.x working copy. Normally I like to do merging from working copy root.
> However, in the sparse setup this does not seem to work:
> If I merge r15744-15745 from
> http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk to my (sparse) working
> copy of of
> http://tortoisesvn.tigris.org/svn/tortoisesvn/branches/1.6.x@15743 using
> depth="working copy", I get
> (1) No text changes at all
> (2) Mergeinfo of /trunk gets added to all sparse subtrees of my WC
> Now, I think (2) is to be expected, although I must say that it looks like
> the sparse checkout and merge tracking features are fundamentally
> incompatible. However, (1) does not make sense to me - it looks like as if
> the merge is not descending the the fully recursive "doc" subtree. Is this a
> bug?
> On the other hand (and this is what I'm doing), performing the merge on the
> fully recursive subtree works fine. That is, if I merge r15744-15745 from
> http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/doc to my working copy
> of of
> http://tortoisesvn.tigris.org/svn/tortoisesvn/branches/1.6.x/doc@15743, I
> get
> 1. All text changes merged
> 2. Subtree mergeinfo for 15744-15745 for both "doc" and "doc/po"
> It seems that many translators are doing something similar, since the
> mergeinfo appears to pile up on the "doc" subtree.
> Comments? Maybe I'm overlooking something obvious in the problem case (1)
> above?

There are some known issues with merge tracking and sparse checkouts.
Most of them should be fixed in the upcoming 1.6 (are you still using
TSVN 1.5.x?). If you're using a nightly build and still see such
problems, you should report them on the Subversion mailing list.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-03-18 17:45:15 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.