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

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

From: Sebastian Celis <subversion_at_sebastiancelis.com>
Date: Tue, 24 Mar 2009 07:42:06 -0700 (PDT)


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

Received on 2009-03-24 15:48:55 CET

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