[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: Tue, 29 Mar 2011 18:17:46 +0200

On 29.03.2011 11:42, Hans-Emil Skogh wrote:
> Hi!
> 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..?

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.

I guess I could code something so that the EOLs are applied right after
the lines are copied.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-03-29 18:17:57 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.