[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-18 17:10:21 CET

On Mar 18, 2005, at 10:21 AM, Volker Hejny wrote:

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

Ah, I understand now. The 'last modified' revision of the file is
greater than the one that was deleted in the source branch, so the
merge is actually removing changes made in the destination branch that
the source branch was unaware of. Yes, I see how that can be something
that deserves a warning or conflict state of some sort.

I can see why subversion would go ahead with scheduling the delete
because no information will be permanently lost in this case. The
problem is that I can imagine some cases where you would want the
delete to silently go through because the changes in the destination
branch are no longer relevant if that entire file is no longer needed,
and yet I can see the other side, where the changes should not be wiped
out by deleting the file because the changes are not part of what the
original branch was trying to undo by the delete.

Scott

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 18 17:12:43 2005

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