Login | Register
My pages Projects Community openCollabNet

Discussions > users [DISABLED] > RE: tree conflicts

subversion
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

RE: tree conflicts

Author "Bolstridge, Andrew" <andy dot bolstridge at intergraph dot com>
Full name "Bolstridge, Andrew" <andy dot bolstridge at intergraph dot com>
Date 2009-09-03 06:56:53 PDT
Message > -----Original Message-----
> From: Stefan Sperling [mailto:stsp at elego dot de]
> Sent: Thursday, September 03, 2009 1:53 PM
> To: Bolstridge, Andrew
> Cc: users at tortoisesvn dot tigris dot org; users at subversion dot tigris dot 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
>

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.

« Previous message in topic | 5 of 6 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
tree conflicts "Bolstridge, Andrew" <andy dot bolstridge at intergraph dot com> "Bolstridge, Andrew" <andy dot bolstridge at intergraph dot com> 2009-09-03 04:01:07 PDT
     Re: tree conflicts markphip Mark Phippard 2009-09-03 04:44:04 PDT
         Re: tree conflicts markphip Mark Phippard 2009-09-03 05:15:07 PDT
     Re: tree conflicts stsp Stefan Sperling 2009-09-03 05:53:25 PDT
         RE: tree conflicts "Bolstridge, Andrew" <andy dot bolstridge at intergraph dot com> "Bolstridge, Andrew" <andy dot bolstridge at intergraph dot com> 2009-09-03 06:56:53 PDT
             Re: tree conflicts stsp Stefan Sperling 2009-09-03 07:49:11 PDT
Messages per page: