RE: RE: Re: Restore of directory from repository does not remove local, unversioned file

>> From: Ryan Schmidt [mailto:subversion-2008c_at_ryandesign.com]
>>
>> Subversion will not remove unversioned files; that would be
>> data loss, which Subversion is specifically designed to prevent.
>
>except in the case where user A deletes and re-adds the same name
>file(s) in a branch, then merges his changes into the trunk
>
>user B is editing said files in the trunk, not yet committed, 'svn up'
>and poof -- data loss!!

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?)

        paul
Received on 2008-10-02 23:40:06 CEST