[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-02-06 13:17:33 CET

Lübbe Onken wrote:
> 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.

That's not a bug. When TortoiseMerge is started to 'compare with working
copy', then the unified diff is applied to the working copy, i.e. the
*patch* part of TortoiseMerge is used.
There's a difference between 'unified diff viewer' and 'patch tool'. But
since there are no UI patch tools out there except TortoiseMerge,
there's no setting for it in the settings dialog.

Stefan

-- 
        ___
   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 13:17:48 2007

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