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

Re: "svn: Invalid tree conflict data"

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 16 Oct 2008 11:04:52 +0200

On Wed, Oct 15, 2008 at 07:42:25PM +0200, Daniel Shahaf wrote:
> Does this conflict ---
>
> % svn rm wc1/iota; svn ci
> % svn rm wc2/iota; svn up
>
> ?

It should.

> If so, why? How do the two changes disagree?

They don't. But when updating, we don't know whether what happened is
two deletes, or whether this happened:

     % svn move wc1/iota wc1/iota.moved; svn ci
     % svn rm wc2/iota; svn up

Which is definitely a conflict.

> > If you disagree, how, exactly, would you define an add on top of an add?
>
> Having the same copyfrom path and rev sounds a sane criterion and was
> suggested before.

The file (or directory) content also needs to be the same for it to
not be a conflict.

For directories, raising a tree conflict is the only option anyway.

What kind of conflict should be raised when files do not have matching
content in this situation is still unclear to me. We should collect the
pros and cons involved in either option and then make a decision.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-16 11:05:11 CEST

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