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

Re: Merging into sparse working copy fails

From: Kari Granö <kari.grano_at_gmail.com>
Date: Thu, 19 Mar 2009 22:27:46 +0200

Mark Eichin wrote:
> You want to pass --depth=infinite to the merge itself, if it's like the
> I've seen before. Couldn't say if that's actually reasonable, but it
> works...

Thanks for the reply. You appear to be right, adding "--depth=infinity"
makes the merge work. However, this looks like a surprising default to me.
Contrast this with e.g. "svn update" behavior: there the working copy depth
is respected in a deep manner. Not so with "svn merge": there the working
copy depth appears to be shallow, taken from the target directory.

Is there any reason for this asymmetry?

>> (2) It seems that merging into a sparse working copy always creates
>> mergeinfo, which is not a good thing for reintegrate merges, and makes
>> reasoning about performed merges hard. What is the recommended practice
>> with merging and sparse checkouts? Should the merging only be done on
>> infinite working copies?

Do you have an opinion on this? If one wants to avoid subtree mergeinfo,
the use of sparse checkouts seems impossible to me.

Best regards,


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-20 17:30:56 CET

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

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