Re: svn merge on branches containing moved files/directories

Hi Ben and Scott,

On Thu, Mar 17, 2005 at 09:05:28PM -0600, Ben Collins-Sussman wrote:
>
> 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?

Not at all. The files actually were deleted. That's also what 'svn delete'
is doing: scheduling a file for deletion in the repository, but already
delete it in the working copy. (And this behaviour of svn delete is
fully ok and reasonable.)

> 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.

Note: That was not I was talking about! Locally-modified files are handled
carefully and in the same way as 'update' does. The point is, that the
file is not 'locally modified', but the modification was already comitted
to trunk. In that case, the file is deleted silently.

Volker

-- 
Dr. Volker Hejny                Tel: 02461/616853                      ** 
Institut f. Kernphysik          Fax: 02461/613930                     **
---------------------------------------------------------------- **  ** ---  
Forschungszentrum Juelich GmbH, D-52425 Juelich                    **
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org