On Apr 15, 2011, at 01:06, Tony Butt wrote: > On a particular piece of code, the svn diff header claims 33 old lines, > when there are actually 32. > > I have re-run this with an external diff command > (svn diff -r 57968:57969 --old <somepath> --diff-cmd=/usr/bin/diff > out.diff) > > and the problem goes away.
You're talking about the header that looks like this? @@ -183,6 +185,8 @@ (Meaning, in this case: The old version had 6 lines beginning at line 183; the new version has 8 lines beginning at line 185) Is it possible the document has mixed line ending styles? -- some lines ending with CRLF and some ending with LF? If so, fix this, ideally by making use of the svn:eol-style property.
