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

Re: Trouble with diff

From: Tobias Ringström <tobias_at_ringstrom.mine.nu>
Date: 2005-03-30 17:20:34 CEST

Marcel Broeken wrote:

> Hi everyone,
> This is my first mail to this mailing list, so please be gentle ;)
> I'm using svn 1.1.3 on Mac OS X and have stumbled onto a problem with
> svn diff. I've deleted three lines from input.php. These lines
> correspond to lines 198, 199 and 200 in input.php.svn-base. When I run
> svn diff it outputs input.diff. This is not what I expect which should
> include something like:
> -<p>
> -Note: <code>mum</code> stands for micrometer (&micro;m).
> -</p>
> Any thoughts?

You are having a problem with mixed end-of-line (EOL) markers. Most of
your file uses LF:s, but some lines uses CR:s. This confuses diff.

I suggest that you set the property svn:eol-style to native on your text
files. That way the EOLs will be correct on every platform, and svn will
help you make sure that the files do not contain mixed EOLs.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 30 17:25:01 2005

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.