[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: Neels J. Hofmeyr <neels_at_elego.de>
Date: Sat, 01 Nov 2008 02:10:44 +0100

Stephen Butler wrote:
>>>>> 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.

Am I understanding this right: Instead of downloading the new file from the
server, it uses some prior knowledge and assumes that the file on disk is
actually what would be downloaded, and uses that instead?

So getting the local mods in there is more like, say, an accident, right? Is
this always safe? Is it checked to be?


Received on 2008-11-01 02:11:11 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.