[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: Hans-Emil Skogh <Hans-Emil.Skogh_at_tritech.se>
Date: Thu, 31 Mar 2011 07:05:16 +0000

>> I'm using TortoiseMerge to merge some changes in some files that have
>> LF line endings.
>> The problem is as follows: If I select "Use this text block" on one
>> of the sides, this line is copied to the other side (as expected).
>> However the line doesn't get any line ending marker at all, and
>> TortoiseMerge flags the line as having white space difference.
> 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.

They were both strictly LF-only.

> 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.
> I guess I could code something so that the EOLs are applied right after
> the lines are copied.

Seems to work the way I expect it to work in the latest nightly. Thanks!



To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-03-31 09:05:30 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.