[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: Stefan Haller <haller_at_ableton.com>
Date: 2005-03-18 21:12:19 CET

Scott Palmer <scott.palmer@2connected.org> wrote:

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

Huh? I don't see how this is any different from textual conflicts
within a single file. If one developer deletes a section of code in a
file, and another developer commits a change to that same section of
code (or vice versa), of course you want to have a conflict. You
absolutely don't want Subversion to silently drop some changes because
the context of those changes no longer exists.

Stefan Haller
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 18 21:15:25 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.