[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: Dave Lawrence <dlawrence_at_ad-holdings.co.uk>
Date: Fri, 22 Aug 2008 18:00:04 +0100

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.

>
> If show log is launched from the repo-browser, with the browser set to
> show a specific revision, then it is that revision that is used as the
> peg revision, so this is a fairly straightforward workaround, now I have
> figured it out.
>
> I have seen the issue in "real life" on an http repo. I checked nightly
> build 1.5.2.13747 and the behavior is the same.
>
> Thanks
>
>
>
>
> ------------------------------------------------------------------------
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
> For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-08-22 19:00:24 CEST

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