SteveKing wrote:
> Simon Large wrote:
>
>> 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.
>
> Fixed in revision 1917.
Well, no it's not. In case 1, it just doesn't save the changes.
Show log for file.
Diff old revision with working copy.
"Use this text block" for 1 line from old revision.
File->Save
Nothing is saved ...
Simon
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Nov 10 16:15:19 2004