[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" on a merged file from Update log uses TortoiseMerge instead of external diff viewer

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-08-08 17:38:43 CEST

Anton P. wrote:
> The following issue seems to occur only in the specific situation
> described (merged file, update log, context menu). Diffing is correctlty
> delegated to my external diff viewer (WinMerge) in all other situations
> that I have encountered.
>
>
> Problem:
>
> Even when an external diff viewer is configured, TortoiseMerge is used
> to "Compare with working copy" when choosing this option from the
> context menu of a merged file in the dialog that is shown when updating
> a file or folder. This option in the context menu is bold, indicating
> that it is the same operation as will be performed when double-clicking
> the file. However, when double-clicking the file, the external diff
> viewer is used as expected.
>
> Expected results:
>
> The external diff viewer should be used when choosing "Compare with
> working copy" from the context menu of a merged file displayed in the
> Update log.
>
> Actual results:
>
> TortoiseMerge is used instead.

There are three different situations here:
1) diffing two files
2) applying a patch/unified-diff file
3) diffing three files

The "compare with working copy" option works differently depending on
what item you choose it on and what state that item has.

If you use it on files which have no conflict and no remote changes
(file is not merged but only locally modified), then the diff tool is
started.

For directories, a unified diff is created and then TortoiseMerge is
started to apply that diff to the working copy. In that case, TSVN
always starts TortoiseMerge because it's the only tool capable of
applying patchfiles with a GUI.

If the file has remote changes (indicated by the 'merged' indicator in
the update progress dialog), then the *merge* tool is used to compare
three files: the base file, the file in the working copy and the file in
the repository.

If the file has conflicts, also the merge tool is started with the three
files (base, yours, theirs) created during the conflict.

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 Wed Aug 8 17:37:02 2007

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