Re: [TSVN] Diff / Merge settings

On Wed, 9 Feb 2005 14:33:02 +0100, Lübbe Onken <l.onken@rac.de> wrote:

> Two things:
> 1) When I uncheck the "Don't convert when diffing against base" option I get
> a "WC\.svn\tmp\bussim.h.tmp: file not found" message from my external diff
> tool, even though the parameters are passed on the command line:
> 'C:\Programme\ExamDiff Pro\ExamDiff.exe %base %mine'
>
> If I use the builtin diff, everything works as expected, but it looks like a
> nonexistent filename is passed as %mine to the external diff tool.

The filename passed is ok. It's just that after the diff program is
started, the temp file is deleted by TSVN - seems your diff program
doesn't like that.

I'll change that soon...

> 2) Setting hashes (#) in front of the command lines looks 'a bit' random to
> me. Hashes are placed in front of each command line if the internal tool is
> selected. Sometimes this happens when I click on 'Internal', sometimes not.
> If I select External Diff and afterwards Internal merge, a hash is placed in
> front of the diff path as well, which is plain wrong.
>
> You can create any weird combination. Sometimes the hash is placed when you
> click on 'Internal' sometimes it's only placed when you click on 'accept'.

I'll check that.

> If I click on external, the hash is never removed. If I forget to remove the
> '#', the internal tool is still active. This is inconsistent.

Good point. We should remove the hash then...

> Why are you using the '#' at all? Is it just to save a registry setting?

I think you should know (or remember). The reason for this is that
some people want to use other external diff/merge tools, but still be
able to switch fast between the external and TMerge. So we need a way
to 'deactivate' the external diff/merge program _without_ deleting it
completely (otherwise you'd have to enter the path and the params all
over again).

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org