Re: [BUG] Merging to a branch with sparsely checked out files fails without error

On Tue, 24 Mar 2009 13:07:01 -0400 Paul Burba <ptburba_at_gmail.com> wrote:
>> Just add --depth=infinity to your merge command and it works fine.
>> This is the expected behavior.  I am not exactly sure why, but it has
>> been explained before on this list.

> I recall that too, but can't find it. Anyhow, the way it works is:
> "The default depth of a merge is the same as the merge target."
> For example, if you don't specify a --depth and merge into directory
> that was checked out at depth=immediates, then the merge will proceed
> as if you specified --depth immediates. It won't matter if some of
> the target's children are themselves checked out a a greater depth.

This default is a bit surprising, if you ask me. If I have a sparse working
copy, why would I want to limit merge depth to the sparse root of the merge
target? I can't come up with any use case.

For TortoiseSVN (and possibly other GUI clients) this is even misleading,
since TSVN shows default depth as "Working copy" in the GUI. When you merge
into a sparse working copy, you have to change the "working copy" depth to
"fully recursive" in order to get a meaningful merge. Not a Subversion
issue, but proves to show that this behavior surprises many people.

Is there any possibility for changing this default?

Regards,
Kari

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1405579
Received on 2009-03-24 21:14:58 CET