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

Re: Compare revisions can use the wrong peg revision

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 23 Aug 2008 08:59:17 +0200

Dave Lawrence wrote:
> Dave Lawrence wrote:
>> I've attached a script (as a .txt) to create a simple repos with 4 revs
>> to demonstrate this problem. It creates test.txt, modifies it in revs 2
>> and 3, and renames it to test_newname.txt in rev 4.
>>
>> To put things in context, it then does a command line svn diff on rev 1
>> and 2 using peg revisions in different ways.
>>
>> After running the script, do a show log on test_wc, and click compare
>> revisions on rev 1 and 2. It shows test.txt modified. So far so good.
>> Now double lick on test.txt, and the error occurs:
>> "File not found: revision 4, path '/test.txt'
>>
>> It (I presume) is trying to diff revs 1 and 2 of test.txt_at_4, but
>> test.txt no longer exists at rev 4. I think that it should either use
>> test.txt_at_2 or text_newname.txt_at_4 (not sure if there is a preference here).
>>
>> It could be worse, because if a trunk has been replaced by a branch,
>> this behavior could actually bring up a diff on completely the wrong file.
>
> I retract that statement. For some reason, if a file of the same name
> existed in the previous trunk, and you invoke the diff from show log of
> the current trunk, then the diff correctly shows the differences between
> the two revs of the correct file (even though it lived in the branch
> back in the revs that are being diffed). But for files that live in the
> current trunk, came from the old branch and didn't have an equivalent in
> the old trunk, the failure is the same. If that description is unclear
> (I suspect it is) then I can do another script to demonstrate.

Yes, please do. It's very difficult from such descriptions to find the
exact steps to reproduce something.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-08-23 08:59:34 CEST

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