Login | Register
My pages Projects Community openCollabNet

Discussions > dev > Re: TortoiseMerge line ending inconsistency

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

Re: TortoiseMerge line ending inconsistency

Author steveking
Full name Stefan Küng
Date 2011-04-22 10:12:37 PDT
Message On 22.04.2011 18:29, Oto BREZINA wrote:
> On 2011-03-29 18:17, Stefan Küng wrote:
>> On 29.03.2011 11:42, Hans-Emil Skogh wrote:
>>
>> The file on the left side might have different EOLs than the one on the
>> right. That's why the EOLs are not copied over.
>> But they're applied when you save the file, but the EOLs of the lines of
>> the rest of the file are used to detect what EOLs need to be saved.
>>
> 1. this means I can not have mixed EOL in final file?

Yes you can. But lines taken over from another file or lines added by
entering text manually will have the EOLs that the main file mostly uses.

>> I guess I could code something so that the EOLs are applied right after
>> the lines are copied.
>>
> 2. should same approach apply to "use file"?

Yes.

Stefan

--
        ___
   oo // \\ "De Chelonian Mobile"
  (_,\/ \_/ \ TortoiseSVN
    \ \_/_\_/> The coolest Interface to (Sub)Version Control
    /_/ \_\ http://tortoisesvn.net

« Previous message in topic | 5 of 5 | Next message in topic »

Messages

Show all messages in topic

TortoiseMerge line ending inconsistency Hans-Emil Skogh <Hans-Emil dot Skogh at tritech dot se> Hans-Emil Skogh <Hans-Emil dot Skogh at tritech dot se> 2011-03-29 02:42:42 PDT
     Re: TortoiseMerge line ending inconsistency steveking Stefan Küng 2011-03-29 09:17:55 PDT
         RE: TortoiseMerge line ending inconsistency Hans-Emil Skogh <Hans-Emil dot Skogh at tritech dot se> Hans-Emil Skogh <Hans-Emil dot Skogh at tritech dot se> 2011-03-31 00:05:25 PDT
         Re: TortoiseMerge line ending inconsistency otik Oto BREZINA 2011-04-22 09:29:42 PDT
             Re: TortoiseMerge line ending inconsistency steveking Stefan Küng 2011-04-22 10:12:37 PDT
Messages per page: