[TSVN] Diff / Merge settings

Hi Folks,

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.

This file is not created when using the builtin diff viewer.
%base is: WC\.svn\text-base\bussim.h.svn-base (Caption is bussim.h.tmp :
Basis)
%mine is: WC\.svn\tmp\bussim.h.tmp (Caption is bussim.h.tmp : Arbeitskopie)

I think the captions are wrong. They should not have the '.tmp' appended to
the filename.

WC\.svn\tmp\bussim.h.tmp really does not exist. Where does the internal
viewer find its file?
If I switch Tmerge's Language to english, the %mine caption changes to:
'bussim.h.tmp : Arbeitskopie (not found)' Does that tell you something?

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'.

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.
Why are you using the '#' at all? Is it just to save a registry setting?

I would get rid of the hashes alltogether.

Cheers
- Lübbe

--
       ___
  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