On Tue, Mar 24, 2009 at 11:05 AM, Mark Phippard <markphip_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.
Paul
> Mark
>
> On Tue, Mar 24, 2009 at 10:42 AM, Sebastian Celis
> <subversion_at_sebastiancelis.com> wrote:
>> Hello,
>>
>> I ran into a bug while attempting to perform a merge inside of a working copy with lots of sparsely checked out directories. In my particular situation, svn says that the merge succeeded, but none of the file contents have been modified. Only a few svn:merge-info properties have been set.
>>
>> I believe the issue only occurs when merging into a branch that has been sparsely checked out. Parent directories to the branch can be sparsely checked out without issue, but if the branch itself is sparsely checked out, this issue will occur.
>>
>> I am attaching a shell script that reproduces the bug. I have confirmed that this happens in both the 1.6.0 client as well as 1.5.6.
>>
>> Thank you,
>> Sebastian Celis
>
>
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1403046
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1403978
Received on 2009-03-24 18:07:20 CET