[TSVN] TMerge line-end bugs

Hi Stefan,

I have just encountered 2 problems with TMerge.

1. I made some changes to a file, diffed with the base copy and decided
to "use this text block" for one line, to revert that line to the base
copy. When I saved the file I found that all my line endings were
converted from CR-LF to LF. TMerge has 'ignore line endings' turned on.
The
file's eol-style is native.

2. I changed a single character in 1 line of a text file. I then used
TMerge to diff with the base copy with TMerge's 'ignore-line-ending'
setting turned off. In that case it shows me that _every_ line in the
file differs.

I guess in both cases an EOL conversion is not happening somewhere. The
file is plain ascii text.

I used a binary viewer to confirm that it is not my text editor changing
the line endings.

It may not make any difference to the repo because SVN auto-converts
anyway, but it is very disconcerting when my text editor asks me if I
want to convert the file from Unix to DOS format.

TSVN build 1898.

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Nov 4 17:29:54 2004