Re: svn merge on branches containing moved files/directories

On Mar 17, 2005, at 7:17 AM, Scott Palmer wrote:
>
>> As described in the initial example: Both files in question, the
>> changed one and the added one, are deleted by svn, i.e. no longer
>> there. There are not just 'unversioned'. There are no files any more
>> which can be marked as '?' and taken care of later.
>
> he was mistaken?
>

I have no idea. Perhaps Volker was confused by what he saw. The 'svn
merge' command will "skip" over a locally-modified file, rather than
delete it. Try it yourself.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 18 04:07:58 2005