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

Re: TortoiseMerge and old editors (CTRL-Z)

From: Bastiaan Veelo <Bastiaan.N.Veelo_at_ntnu.no>
Date: 2007-06-09 11:02:45 CEST

Stefan Küng wrote:
> Bastiaan Veelo wrote:
>> Hi,
>>
>> and thank you for TortoiseSVN!
>> There is a bug in recent versions (running 1.4.3) that TortoiseSVN
>> cannot diff a file if it contains a CTRL-Z marker at the end of the
>> file. You get the message "Cannot show diff because of inconsistent
>> newlines in the file". Command line clients, both native and from
>> Cygwin, do not have this problem.
>>
>> We have users who use editors that automatically add this marker, so
>> this is a serious limitation for them.
>>
>> There is a small thread about this:
>> http://svn.haxx.se/tsvnusers/archive-2007-01/0159.shtml
>
> That should work now with the latest version from trunk. If you like,
> you can try it out and report back if you find any more issues with
> that version.
>
> Stefan
>
I did a quick test with Build 9703, and it seems to be working. Thank you!

Bastiaan.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Jun 9 13:37:45 2007

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.