[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-03-15 20:41:05 CET

On Mar 15, 2005, at 12:10 PM, Volker Hejny wrote:
>
> Well, does subversion really delete an edited file without giving
> a conflict?

No, it just makes the file 'unversioned'. It refuses to delete
irreplaceable data.

If the file (or directory) has no local changes at all, then yes, 'svn
up' will actually delete the thing.

> The request to delete these
> files - to my opinion - must give a conflict. The user than knows
> that he has to take care of that.

Well, running 'svn status' will show your file as '?'. That's a pretty
clear indication that it's something to take notice of.

The sort of 'conflict' marker you're talking about, (when status shows
'C'), is specifically for textual conflicts, not for tree-based
conflicts.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Mar 15 20:44:29 2005

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