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

TortoiseMerge line ending inconsistency

From: Hans-Emil Skogh <Hans-Emil.Skogh_at_tritech.se>
Date: Tue, 29 Mar 2011 09:42:33 +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. I would expect the copied line to have a LF line ending and no difference should be indicated by TortoiseMerge.
If I save the file and press F5, the LF line ending character appears on the line and TortoiseMerge then indicates that there is no difference in the lines.

Looks like a bug..?

(Running TortoiseSVN 1.6.99, Build 21076 - 32 Bit -dev, 2011/03/28 20:29:13, but this behavior seems to exist in 1.6 as well.)



To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-03-29 11:42:44 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.