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

tree conflicts and obstructions

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 27 Mar 2008 12:46:04 +0100

Hello Steve, Julian, Nico, and others interested,

One of the failing tests on the tree-conflicts branch shows that
we have a gap in the design.

Namely, we have not yet defined how svn should behave if a file
is obstructed by an unversioned item of the same name during
update/switch and merge.

See http://subversion.tigris.org/issues/show_bug.cgi?id=3139

Currently, during update and switch obstructions cause the operation
to fail:
svn: Failed to add file 'b': object of the same name already exists

I think this behaviour suits us fairly well already.

But obstructed files are currently silently skipped during merge!

I suppose we should flag obstructed files as tree conflict
victims during merge, except when their name appears in the
svn:ignore property on the containing directory.


Julian has already expressed implicit consent in
http://subversion.tigris.org/servlets/ReadMsg?list=dev&&msgNo=136402 ,
but I want to make sure everyone agrees with us here.

We should update detection.txt accordingly, and possibly also

Stefan Sperling <stsp_at_elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner

  • application/pgp-signature attachment: stored
Received on 2008-03-27 12:46:45 CET

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