[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn merge on branches containing moved files/directories

From: Scott Palmer <scott.palmer_at_2connected.org>
Date: 2005-03-16 15:37:00 CET

On Mar 16, 2005, at 9:14 AM, Ben Collins-Sussman wrote:

>
> When merging in the other direction, the merge command silently
> deletes the newer version of the file.
>

I had always assumed that under the hood merge (or at least half of it)
was implemented with the same code that does update. How is it that a
merge is able to delete a modified file where an update does not?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 16 15:42:17 2005

This is an archived mail posted to the Subversion Users mailing list.