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

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

From: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 24 Mar 2009 11:05:15 -0400

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.

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
Received on 2009-03-24 16:05:31 CET

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

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