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

New tree conflicts for obstructions?

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 11 Nov 2011 13:28:02 -0500

It looks like SVN 1.7 added some new tree conflicts. For example, when
doing an update and SVN wants to add a file that already exists it creates
a tree conflict.

$ svn status
D C .settings/org.eclipse.wst.common.project.facet.core.xml
*> local unversioned, incoming add upon update *
D C .settings/org.eclipse.wst.common.component
*> local unversioned, incoming add upon update *
Summary of conflicts:
  Tree conflicts: 2

We need to add support for this in Subclipse. From what we can see the
only resolve option is to accept=working and this resolves by scheduling a
delete. This makes very little sense and seems like a bug.

What I normally do is use svn update --force which does not produce a tree
conflict and instead just slides the added file into pristines so that only
local differences now show up as a local modification that can be committed
or reverted. It seems like resolve needs to support some resolutions like
that, which I guess would just be an option to mark the conflict resolved
but do nothing.

Mark Phippard
Received on 2011-11-11 19:28:36 CET

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

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