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

RE: Re: TortoiseMerge loses line-endings?

From: <tob-t_at_gmx.de>
Date: Tue, 10 Feb 2009 08:21:17 -0800 (PST)

Is there a release planned with this fix inside?

Or where can I get the r15192. I ran into the same problem, while merging a project with over 700 files making the files useless.

Switching back to 1.5.6 makes it work, but then the update message pops up. Disabling the update check means I probably miss the update ;)

Hopefully I address the right people here!

Thanks in advance for every apply,
Tobi

> 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=1134889

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-10 17:37:38 CET

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