[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: TortoiseMerge line ending inconsistency

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 22 Apr 2011 19:12:17 +0200

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
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2722795
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-22 19:12:37 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.