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

Reintegrate merging with sparse checkouts

From: Brian Neal <bgneal_at_gmail.com>
Date: Fri, 18 May 2012 14:48:10 -0500

Hello -

My question is basically the same as this one:


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?

Thank you,
Received on 2012-05-18 21:48:47 CEST

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