Re: [TSVN] Some questions I couldn't get answered

Simon Large wrote:
> SteveKing wrote:
>> Simon Large wrote:
>>
>>> Ah, I understand the problem now. And maybe there is a solution.
>>> TSVN passes the pristine copy directly to the external diff
>>> program. Maybe that is not a safe thing to do anyway, because the
>>> external program could modify the pristine copy. So we could solve
>>> 2 problems if the pristine copy was converted to the same eol-style
>>> in a temp file before passing to the external diff/merge program.
>>> That _might_ slow things down a bit for large files.
>>
>> What do you think this option here is for?
>>
>
http://tortoisesvn.tigris.org/docs/TortoiseSVN_en/ch05s25.html#tsvn-DUG-settings-progs
>> (the option at the bottom of that dialog, called "Convert files when
>> diffing against BASE").
>
> I think it is for doing what the hint and the docs say, which is
> unexpansion of keywords. There is not mention of eol conversions.
> Should
> there be?
>
>> Simon, I can't believe you missed this? *You* wrote the docs! ;)
>
> Ho hum. I didn't write right.

The next question is, if the external tool allows you to copy sections
from pristine to working copy, or make other edits, does TSVN spot the
changes and copy the temp file back again? I think not. Not even in
TMerge. You have to know that a temp file is in use, navigate to the
real WC and save there. And if you do that you end up with an LF-only
file. Is Subversion happy with that, or does it see it as a whole file
change?

Just spotted a 'feature' with this option too.

Using builtin diff, convert files option checked.
In a WC, change a file then SVN diff.
Titles in TMerge are:
'test2.c.4.tmp : Working Base'
'test2.c.4.tmp : Working Copy'

The working base filename should be the WC filename _before_ conversion.
(Yes, I know it it is really test2.c.svn-base, but we should be
consistent).

Simon

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