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

Re: Bug: Alternate diff program used only under SVN Diff menu item

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 30 Dec 2011 08:57:04 +0100

On 29.12.2011 13:25, Łukasz Indeka wrote:
> Hi,
> Alternate diff program defined in Settings is used only under SVN Diff menu item, when comparing with base version. In all other cases, default program is used.
> Steps to reproduce:
> 1. Open Tortoise SVN Settings, choose External Programs from the tree on the left.
> 2. Under Advanced.. button define alternate diff program for extension (eg. xyz).
> 3. Commit two files eg foo.xyz and bar.xyz to repository.
> 4. Change foo.xyz file.
> 5. Commit again.
> 6. Change bar.xyz file.
> 7. From Explorer:
> a) right click on bar.xyz and choose SVN Diff.

that's ok as you said.

> b) select foo.xyz and bar.xyz and choose SVN Diff.

works fine for me.

> c) right click on foo.xyz and choose Diff with previous version

works fine for me as well.

> d) right click on foo.xyz, choose SVN Show log, again right click on latest revision, right click then Compare with previous version

this works fine as well.

> e) right click on bar.xyz, choose SVN Show log, again right click on latest revision, right click then Compare with working copy

again, this works just fine.

> What's ok?
> 7. a) uses alternate diff program.
> What's wrong?
> 7. b) - e) uses default diff program.
> Version:
> TortoiseSVN (32 bit)

Using the same version, for me b)-e) work just fine: the alternate diff
tool is used.

however: if you try e) but show the log for a folder, then the "apply
patch" tool is used since that's done by creating a patch file first and
then applying that patch to the working copy.

maybe you didn't set your alternate diff tool correctly?


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-31 02:33:48 CET

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