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

Problem with TortoisSVN diff

From: Sarec, Ivica SP/HZA-EEM2 <sareciic_at_schaeffler.com>
Date: 2006-10-09 15:10:45 CEST

Stefan wrote:
> "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'.
Thank you for the suggestions and the fast reply.
I have checked all files and they have CR+LF as lineendings. Your idea
to change
the lineendings from CRLF to LF and back again didn't work either.
There was allways the diff error with TSVN but not with SVN.
Additionaly I tried the following:
- Switch back to TSVN 1.3.1 and SVN 1.3
   Result: Everything works fine
- Dumped the repository and install the newest TSVN and SVN versions and
loaded the dumpfile into a new repository
  Result: The new project works fine but the older one still has the
diff problem. Even in the log history I cannot compare files.
So in the end I will use TSVN 1.3.1 until I find a way to switch to the
latest version.
Ivi
Received on Mon Oct 9 15:14:16 2006

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