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

Re: unable to reintegrate branch

From: Johan Corveleyn <jcorvel_at_gmail.com>
Date: Fri, 12 Mar 2010 11:26:51 +0100

On Fri, Mar 12, 2010 at 12:19 AM, Manny DaSilva <manny390_at_yahoo.com> wrote:
> Server at v1.6.9
> CollabNet command-line client at v1.6.9
> TortoiseSVN client at v1.6.7
> 1. Trunk copied to branches/X
> 2. Shallow checkout of branches/X creates sparse working-copy:
> X/A
> X/B
> 3. update --set-depth infinity X/A downloads additional folders from X/A
> tree:
> X/A/1
> X/A/2
> X/A/3
> 3. merge --depth infinity <ReposURL>/trunk
> The merge works correctly but causes svn:mergeinfo properties like
> the following. Note the asterisked rev number in svn:mergeinfo:
> /trunk/A:199-202*
> /trunk/B:199-202*

I'm guessing this is mergeinfo on the root of your branch (X).

The mergeinfo with an asterisk is a "non-inheritable merge range". It
means that, at the root of your branch, svn has noted that revs
199-202 are only merged up to A and B respectively, and not deeper (so
anything deeper cannot derive/inherit this mergeinfo; anything deeper
has not yet had those revisions merged from trunk).

This seems a little strange to me, because A should be present in your
working copy with depth infinity, so I would expect:
/trunk/A:199-202
/trunk/B:199-202*

Are you sure there are asterisks for both A and B?

For some more understanding of merginfo, including some explanation of
the asterisk etc., see:
http://www.collab.net/community/subversion/articles/merge-info.html

It's a very long article, so it takes quite some effort to go through
it all, but it can help a lot if you're trying to wrap your head
around it ... (if you already know some basic stuff of mergeinfo you
may want to skip ahead to the section "Mergeinfo Inheritance and
Non-Inheritable Ranges", where the asterisk is explained).

> 4. Using E:\X41\trunk fully recursive working copy of trunk, run:
> merge --reintegrate <ReposURL>/branches/X
> Get this error:
> Command: Reintegrate merge <ReposURL>/branches/X into E:\X41\trunk
> Error: Reintegrate can only be used if revisions 199 through 204 were
> previously
> Error: merged from <ReposURL>/trunk to the reintegrate source, but this is
> Error: not the case:
> Error:   branches/X/A
> Error:     Missing ranges: /trunk/A:199-202
> Error:   branches/X/B
> Error:     Missing ranges: /trunk/B:199-202
>
> Any ideas as to what may be causing these errors?
>

I'm not sure what's the cause of these errors (at least I would only
expect problems for X/B). Maybe it's not possible to reintegrate a
sparsely merged branch? Maybe someone else has experience with this?

Johan
Received on 2010-03-12 11:27:24 CET

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