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

Re: Problem with TortoisSVN diff

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-10-06 19:58:53 CEST

Sarec, Ivica SP/HZA-EEM2 wrote:
> Hi,
>
> recently I updated from version the WinXP 1.3.1 to the latest 1.4.0.
> I have two repositories and everything seemed to work perfect.
>
> Yesterday I wanted to use 'show diff' on the older project and received the
> following error message: "Cannot show diff because of inconsistent
> newlines".
> If I use 'svn diff' instead it shows me the changes.
>
> Oddly the show diff function works perfectly in the newer project.
> Does somebody give me a hint what I can do?

"Cannot show diff because of inconsistent newlines" means exactly that:
you have inconsistent newlines in your file. Which most likely means you
have somewhere CR lineendings instead of CRLF or LF lineendings.

You can try a nightly build and see if it's better (I've added some
workaround for inconsistent newlines, but it's only that: a workaround
which doesn't work in all cases).

Better would be if you fix the inconsistent newlines (open it e.g. in
Notepad2, then change the lineendings to LF and back to CRLF, then save
the file again).

To prevent such problems in the future, you should set the svn:eol-style
property on all text files and set it to e.g. 'native'.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Oct 6 19:59:04 2006

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