On Fri, 2011-04-15 at 02:31 -0500, Ryan Schmidt wrote:
> 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.
It is probable the document has mixed line style endings - I have
updated the line endings in a test repository, but that does not help
with a historical diff. In the meantime, I am trying to educate the
engineers involved about the merits of auto-props, so this is less
likely to happen in the future.
Tony Butt <Tony.Butt_at_cea.com.au>
Received on 2011-04-27 01:46:31 CEST
This is an archived mail posted to the Subversion Users