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

Re: External diff tool ignored in some specific cases

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 25 May 2012 12:02:35 +0200

On Fri, May 25, 2012 at 10:38 AM, Markus Humm
<markus.humm_at_de.ebmpapst.com> wrote:
> Hello,
>
> my colleagues found a issue with the definition of external diff programs today which I can reproduce. So it still exists in TortoiseSVN 1.7.7.
>
> The issue is, that the external diff program defined (WinMerge in our case) is being used as expected for comparing two revisions past, but for comparing the working copy with a past revision Tortoise's diff program is being used. This happens from the graph as well as from the log dialogue.
>

"compare with working copy" first creates a unified diff (patch) file,
and then uses TMerge to 'apply' that patch file in reverse to the
working copy.

Since TMerge is the only UI tool that can apply patch files (as far as
I know), TMerge is used unconditionally for this task.
WinMerge can not apply a patch file (the issue for such an enhancement
is open in their issue tracker for years).

> The graph has an additional issue: depending on whether you've selected the working copy first and the other revision afterwards or vice versa the context menu has the view diff option or not. In my eyes that's a bug as well.
>

Nope, not a bug. The first selected revision determines the action
since in case of multiple selected revs, that's the 'root' revision.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2965027
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-05-25 12:03:04 CEST

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