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

Re: Tree conflict after a simple delete

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 23 Sep 2009 13:32:58 +0100

On Wed, Sep 23, 2009 at 12:12:09PM +0100, Giulio Troccoli wrote:
> > As far as tree conflicts are concerned, Subversion does not
> > know the difference between delete and move, yet. Any delete
> > is therefore treated as a potiential move, which can lead to
> > false positives.
> If I found out this is a false positive, is there a way to tell
> Subversion "look, this is a false positive" ?

If you are sure the conflict is a false positive (e.g. both sides
really meant to delete something), then just mark the conflict as

 svn resolve --accept=working conflicted-file

However, in your case, you seem to have a "delete vs. edit" situation,
so you need to decide whether you'd like the file to be deleted, or
whether you want to keep the file in place.

How to resolve the case of 'delete vs. edit' is actually documented
in the Subversion book:
The example there uses update rather than merge, but it should still
help to understand what you can do to resolve your conflict.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-23 14:33:52 CEST

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.