[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:52:23 +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
>
[snip]
>
> 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
>

Further to this issue, I think one of the 2 issues concerned svn itself
(tree conflict detection) but the other relates to Tortoise's merge
dialog - specifically that it doesn't fully describe what a tree
conflict error is.

For example, I've attached a screenshot of a merge result resulting in a
tree conflict. This is the command line equivalent:

D:\AndyTests>svn status
 M ProjectD
! C ProjectD\Sub1\test2.txt
> local delete, incoming delete upon merge
M ProjectD\Sub1\test1.txt

As you can see, svn says "you tried to delete a file that wasn't there",
yet the merge dialog just says "Tree conflict" on the offending file. It
would be greatly beneficial to have a clearer description in the dialog,
would this be classed as a bug or is it a limitation of the svn
libraries?

Thanks, Andy

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2390669

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Merge.jpg
Received on 2009-09-03 15:52:45 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.