[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 12:15:46 +0200

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"?

I think 1.7 contains some improvements for merging in sparse working
copies [1], but merge is still not smart enough to know that the
merged changes only affect the parts of a sparse working copy which
are present (so it can record the entire revision as merged in the
mergeinfo). However, IIRC, some issues around this are currently fixed
in trunk, so should be part of the 1.8 release:

- 4056: don't record non-inheritable mergeinfo if missing subtrees are
not touched by the full-depth diff [2]
- 4057: don't record non-inheritable mergeinfo in shallow merge if
entire diff is within requested depth [3]

[1] http://subversion.apache.org/docs/release-notes/1.7.html#svn-merge-sparse-no-tree-conflict
[2] http://subversion.tigris.org/issues/show_bug.cgi?id=4056
[3] http://subversion.tigris.org/issues/show_bug.cgi?id=4057
Received on 2012-05-21 12:16:37 CEST

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