RE: RE: Re: Restore of directory from repository does not remove local, unversioned file
Date: Thu, 2 Oct 2008 16:39:32 -0500
>> From: Ryan Schmidt [mailto:subversion-2008c_at_ryandesign.com]
A simpler/more common scenario is a modify on branch A and a rename on branch B, merge B to A and you'll lose the modify.
I mentioned this a while ago, and it turned out to be a bug known since before V1.0. I also proposed a possible approach for a fix, but unfortunately there has been no feedback on that at all. (Maybe it needs to be posted to svn-dev instead?)
This is an archived mail posted to the Subversion Users mailing list.