Re: Symlinks on Win32...

On Tue, 31 Jan 2006 13:57:41 -0500, Mark Phippard
<markp@softlanding.com> wrote:

>What if file1 and file2 are both modified in the working copy?
>
>What does svn delete of one of the files do? What if one is changed and
>the other deleted?

Exactly the same as if another developer had modified the file in
another working copy; either svn merges the differences, or marks the
file as being in conflict. Think of it as two different working copies
of the same file.

Greg

-- 
This post represents the views of the author and does
not necessarily accurately represent the views of BT.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org