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

Re: Bug? Compare with Working copy, no External diff shown

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-10-23 19:44:33 CEST

Yaroslav Pidstryhach wrote:
> Hello,
>
> I want to view differences between the working copy and one of the previous
> revisions. I would also like to merge some differences (from old revisions
> to working copy) using an external diff.
>
> Action performed:
>
> - on the project's root folder in Explorer, right click, TortoiseSVN -> Show
> Log;
>
> - in the log, a revision is selected, right click, Compare with Working
> Copy.
>
> Actual result: TortoiseMerge is displayed regardless of the settings.
>
> Result expected: external diff/merge tool is displayed.

You might expect this, but that's not how this works unfortunately.

> Additional information:
>
> - the external diff is displayed fine when the log for a single FILE is
> shown, not a folder, which means the external diff settings are correct.
> They are actually copied from the help file;

The problem here is that when you 'compare with working copy' from a
folder, TSVN creates a patch file, which then gets applied to the
working copy. Since TortoiseMerge is the *only* program I know of which
can apply a patch file UI-style (there are some command line tools which
can do that), TortoiseMerge is used exclusively for these kinds of
comparisons.
You may notice that TortoiseMerge start up showing an additional small
window on its left side. That window has a list of files which are
modified - that's the indication that TortoiseMerge is in 'patch-mode'.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Oct 23 19:44:45 2006

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