Login | Register
My pages Projects Community openCollabNet

Discussions > users [DISABLED] > Re: Merging into sparse working copy fails

subversion
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

Re: Merging into sparse working copy fails

Author kgr
Full name Kari Granö
Date 2009-03-19 13:28:05 PDT
Message 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.

« Previous message in topic | 3 of 4 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
Merging into sparse working copy fails kgr Kari Granö 2009-03-18 13:10:14 PDT
     Re: Merging into sparse working copy fails eichin Mark Eichin 2009-03-18 14:47:14 PDT
     Re: Merging into sparse working copy fails kgr Kari Granö 2009-03-19 13:28:05 PDT
         Re: Merging into sparse working copy fails eichin Mark Eichin 2009-03-20 10:25:35 PDT
Messages per page: