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

RE: "Compare with working copy" won't use external differ viewer

From: Lübbe Onken <l.onken_at_rac.de>
Date: 2007-02-06 11:16:25 CET

Hi Dylan,

You wrote:
> Hi Lübbe
> 1) I invoke the log dialog by clicking on a folder.
> The snapshot is at here: http://DCMA.twbbs.org/temp/pic4.jpg.
> I also tried to set notepad as external differ viewer. But it
> still doesn't work. :(

We're getting closer and I think I can explain what is happening :)

If you invoke the log for a folder and compare a revision against the
working copy, TortoiseSVN creates a standard (GNU) diff, because it is
looking at the entire changeset (folders and all files), even if only a
single file was changed. That is why the "Unified Diff Viewer" is invoked
and not the "Diff Viewer". This is the reason why araxis merge is not called
at all.

If you invoke the log dialog for a single file and compare a revision
against the working copy, Tortoise SVN creates a diff for this file and uses
the "Diff viewer" defined in the first "external programs" setting. This
should work for you.

But I think that there is a bug in the "compare with working copy" function
of the log dialog. TortoiseSVN either creates a normal or a unified diff
when using this function, but when it creates a unified diff it ignores the
"Unified Diff Viewer" settings. It always uses TortoiseMerge.

If you ask TortoiseSVN to "show differences as unified diff", the user
defined unified diff viewer is used.
> 2) I got this skin from http://osx.portraitofakite.com/boot.htm.
> It's quite beautiful. :D

Thanks :)

- Lübbe

  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Feb 6 11:16:34 2007

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

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