Re: Merging into sparse working copy fails

Mark Eichin wrote:
> You want to pass --depth=infinite to the merge itself, if it's like the
case
> 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
subtree
>> 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
fully
>> 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,
Kari.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1357596

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