On Oct 25, 2004, at 9:09 AM, Michael Abele wrote:
>> Consider the following situation:
>> You have two folders in the main repository being 'application1', and
> 'application2'.
>> User 'A' modifies the file 'application.cpp' en decides to move it to
> folder 'application2'. SVN move: delete/add
>> action and he succesfully commits.
>> User 'B' in mean-time changes his local copy of file 'application.cpp'
> in the folder 'application1' and decides to do a > SVN update.
>> Because of the update the file 'application.cpp', which has local
> modifications, is deleted and is added in the
>> 'application2' directory.
>
> I've tested this with 1.1.1. In our environment (Windows Server 2003,
> Apache 2.0.52, SVN 1.1.1, TortoiseSVN 1.1.1, https access) the
> 'application.cpp' in 'application1' was not deleted, but was not under
> version control anymore after the update.
Michael's right. SVN never, ever destroys local modifications. If
'svn up' tries to a delete a file with local modifications, it just
makes the file unversioned.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Oct 25 16:26:48 2004