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

Re: TortoiseMerge loses line-endings?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 26 Jan 2009 18:22:26 +0100

Hontvári József wrote:
> When I use TortoiseMerge 1.5.7 to merge two text files, line endings of
> the newly included lines are lost.
>
> See the zip file I attached. To reproduce open a2.txt in the left pane,
> a1.txt in the right. Right click on the two empty gray lines and select
> "Use
> other text block". It is even better if you first switch on View menu /
> Whitespaces. Then you can see without saving the changes that
> TortoiseMerge copies the two lines from the left pane but it doesn't
> append a CRLF (or anything else) to the end of the line.

Thanks for the report.
Fixed in r15192.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1055352
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-01-26 18:24:52 CET

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