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

Re: Tree conflict bug?

From: Stephen Butler <sbutler_at_elego.de>
Date: Thu, 30 Oct 2008 10:40:57 +0100

Quoting "Neels J. Hofmeyr" <neels_at_elego.de>:

>
>
> Mark Phippard wrote:
>> On Wed, Oct 29, 2008 at 12:38 PM, Stefan Sperling <stsp_at_elego.de> wrote:
>>> On Wed, Oct 29, 2008 at 11:58:45AM -0400, Mark Phippard wrote:
>>>> Using current trunk. I am doing some basic testing so I can figure
>>>> out JavaHL changes to make around the status/info reporting etc.
>>>>
>>>> I renamed a file and committed it.
>>> So you renamed ColorManager.java to MyColorManager.java, is it?
>>
>> Yes.
>>
>>>> In second WC, I made some edits to file and then did update. This
>>>> reported the tree conflict. I saw stuff like this:
>>>>
>>>> $ svn st
>>>> M C trunk/src/com/acme/ui/editors/ColorManager.java
>>>> M trunk/src/com/acme/ui/editors/MyColorManager.java
>>>>

[...]

>>>> In my example, the edits I made to this file were
>>>> actually automatically transferred to the new file ... Cool!.
>>> Wow, I wish I knew why :)
>
> Yeah, Steve, explain :)

See update_tests.py 37-40 ("update should make use of copyfrom
args").

In the second WC, if the new file is added before the old file is
deleted, then we use the old file as the source instead of asking
the repo. The magic is in add_file_with_history() and in
locate_copyfrom(). Blame tells me the magician was sussman, about
a year ago.

If you include both files in a single commit, you tend not to
get the magic. For instance, in our tree conflict tests it
doesn't happen.

HTH,

Steve

-- 
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
---------------------------------------------------------------------
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-30 10:41:13 CET

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