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

TortoiseMerge: "Cannot show diff because of inconsistent newlines in the file."

From: Jared Silva <jayrod_at_gmail.com>
Date: 2007-01-11 00:03:10 CET

I do not set "svn:eol-style" unless necessary (currently, *.sh and *.bat files).

Starting with 1.4.0, I have been getting an error with TortoiseMerge,
"Cannot show diff because of inconsistent newlines in the file." I
get the error when trying to view diffs for an HTML file I do not
edit, but version control. I do not get the error with TortoiseMerge
1.3.5.

I feel this is a bug for the following reasons:
• TortoiseMerge 1.4.X is not backwards compatible with 1.3.5
(TortoiseMerge 1.3.5 handles mixed CRLF)
• svn diff handles mixed CRLF when "svn:eol-style" is not set
• WinMerge handles mixed CRLF

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Jan 11 00:03:23 2007

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