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

RE: tree conflicts

From: Bolstridge, Andrew <andy.bolstridge_at_intergraph.com>
Date: Thu, 3 Sep 2009 14:56:50 +0100

> -----Original Message-----
> From: Stefan Sperling [mailto:stsp_at_elego.de]
> Sent: Thursday, September 03, 2009 1:53 PM
> To: Bolstridge, Andrew
> Cc: users_at_tortoisesvn.tigris.org; users_at_subversion.tigris.org
> Subject: Re: tree conflicts
> It is a limitation in the way Subversion implements moves.
> *Any* delete vs. delete tree conflict is a false positive.
> Now, why do we have false positives? Who would inflict something
> this stupid upon their users? The problem is really rooted in a design
> decision made way back when Subversion was in its infancy.
> Subversion implements a move as copy+delete. So when you run
> "svn move a b" (or do the equivalent in Tortoise), the client
> internally does the equivalent of:
> svn copy a b
> svn remove a

OK, I think I've come to that conclusion myself when using the command
line instead of Tortoise. Partly in my original UI error report Tortoise
was correct - it was complaining about an obstruction (as the merge
tried to add test1 to the subdir because I had added both files at the
same time, instead of doing them separately).

Thanks for the explanation, I understand fully now - sometimes an add is
not an add but a copy and nothing can detect that yet.

I suppose renames is tricky if you want to keep history... but that
shouldn't stop you from ignoring deletes, it's just the file addition
that matters and has (sometimes) to be converted into a svn move
instead, so you could skip deletes and solve half of all tree conflicts
in 1 go :)

I can understand why you'd want to point out the warning, and perhaps
Tortoise could do a better job of showing the error description - I'll
raise that separately, thanks.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-03 15:57:45 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.