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

Re: Reintegrate merging with sparse checkouts

From: Johan Corveleyn <jcorvel_at_gmail.com>
Date: Mon, 21 May 2012 16:01:46 +0200

[ Redirecting back to the list -- please always use "reply all" to
keep the discussion on the list. More below ... ]

On Mon, May 21, 2012 at 3:54 PM, Brian Neal <bgneal_at_gmail.com> wrote:
> On Mon, May 21, 2012 at 5:15 AM, Johan Corveleyn <jcorvel_at_gmail.com> wrote:
>> On Fri, May 18, 2012 at 9:48 PM, Brian Neal <bgneal_at_gmail.com> wrote:
>>> Hello -
>>>
>>> My question is basically the same as this one:
>>>
>>> http://svn.haxx.se/users/archive-2010-04/0097.shtml
>>>
>>> We are forced to use an unwieldy and inconvenient directory structure.
>>> Spare checkouts are a big help to us. But it seems that (in the few
>>> times I have tried) to reintegrate a feature branch to trunk it has
>>> failed if either of the working copies are sparse. I believe I
>>> understand why this is; when you merge from trunk to your branch, the
>>> merge info cannot get applied to the directories you have omitted from
>>> your branch working copy. And when you finally go to reintegrate your
>>> branch back to trunk, the reintegrate fails because SVN sees you have
>>> not applied all the changes to certain directories.
>>>
>>> Perhaps I have done this wrong. If I have the same sparse directory
>>> structures in my trunk & branch working copies (i.e. I made them
>>> sparse in exactly the same way), should the reintegrate merge work?
>>>
>>> Otherwise is there a way to tell SVN that the directories I omitted
>>> from my working copies are irrelevant and do not need to be merged?
>>
>> Which version of svn did you use (client-side)? What do you mean by "failed"?
>
> SVN 1.7.4.
>
> "Failed" as in the reintegrate merge back to trunk was prevented from
> happening. I regret not writing down the error message, but the gist
> of it was SVN could not find merge info on the directories I did not
> have in my sparse working copies. To work around it, we either have to
> reintegrate merge sub-directories multiple times, or just remove the
> --reintegrate flag and deal with the less than ideal results (tree
> conflicts).
>
> When I get some time I will try to come up with a toy example that
> reproduces the issue.

Yes, that would be very useful.

I don't have any more ideas at this time (I have no experience with
(reintegrate-)merging combined with sparse working copies, I just
remembered the issues from the issue tracker).

Maybe someone else on the list has experience with that ...

-- 
Johan
Received on 2012-05-21 16:02:42 CEST

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