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

Re: "Cannot show diff because of inconsistent newlines in the file" False Positive With Mac File

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-11-15 19:26:49 CET

Alex Oss wrote:
> I've attached two small files (1k, 20 lines each) with Mac line
> delimiters (0x0D). (I had to put them in a zip file so they wouldn't
> get mangled by my email client.) When I ctrl-click on these two files
> in Windows Explorer, then right-click on them, then select TortoiseSVN
> and then Diff, I get a TortoiseMerge error message "Cannot show diff
> because of inconsistent newlines in the file". However, when I look
> at these files in a hex editor, the only line delimiters are Mac line
> delimiters. Is this a bug?
> I'm using TortoiseSVN 1.4.5, Build 10425 - 32 Bit , 2007/08/26
> 11:14:13 on Windows XP Professional.

That's a known issue with the 1.4.x versions. It works in the latest
nightly build.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Nov 15 19:27:31 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.