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

Re: Diff shows not the correct result

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-01-24 21:58:26 CET

Susser, Michael RD-AS5 EXT wrote:
> Hi all,
>
> i think i have found a small bug in TSVN 1.4.0 Build 5497. Let me
> explain what to do to reproduce it:
>
> - create a new file Diff.txt in REPO/trunk with some lines of code in
> it, add it to the repo and commit
> - branch REPO/trunk to REPO/branch/v0.1
> - insert a new line of code in REPO/trunk/Diff.txt and commit
> - append a new line of code in REPO/branch/Diff.txt and commit
> - show log on REPO and diff the two latest revisions
>
> Diff shows only the appended line from the branch version but not the
> inserted line from trunk!
>
> However, when i use the Repo-Browser, select the two files
> REPO/trunk/Diff.txt and REPO/branch/Diff.txt and do the diff on this
> selection, the result is as expected.
>
> Can anyone confirm this behaviour?

If you select revision 1 and 3 and diff those, you'll see all the lines.
The reason is simple: a diff between revision 2 and 3 shows you what has
changed *between* those revision, actually the change you committed in
revision 3. The change you committed in revision 2 was done between 1 and 2.
When you then diff in the repobrowser, you're diffing two urls, not two
revisions.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Jan 24 21:58:56 2006

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

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