Re: [TSVN] Don't convert when diffing against BASE

On Mon, 14 Feb 2005 13:41:34 -0000, Simon Large <slarge@blazepoint.co.uk> wrote:
> Hi Stefan,
>
> The Don't convert checkbox appears in the Diff settings and not Merge.
> Doesn't it apply in both cases? If so it should really be outside the
> groupbox.

No, only for diffs. Merging is used for three files, which Subversion
already creates in case of a conflict - no need to create yet another
temp file from those.

> Actually, can we get rid of this option completely by looking at the
> svn:keywords property and only using the temp file if keyword expansion
> is enabled? Or is there another reason to use a temp file?

Rather not. Right now, if you're not using the temp files the diff
program starts almost immediately on a doubleclick in the e.g. commit
dialog. It will slow down (a little) if you first have to create a
temp file - I would _never_ use that option at all!

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