Re: Error with svn diff

2011-04-28 Thread Ryan Schmidt
On Apr 27, 2011, at 20:06, Tony Butt wrote: > On Wed, 2011-04-27 at 02:05 -0500, Ryan Schmidt wrote: >> Do educate on which files should have svn:eol-style set to what value, and >> do encourage developers to use auto-props to automate what they learned, but >> also install a pre-commit hook scri

Re: Error with svn diff

2011-04-27 Thread Daniel Shahaf
Tony Butt wrote on Thu, Apr 28, 2011 at 11:06:36 +1000: > For me, using an external diff (gnu diff) with the offending package > (codestriker) works fine in this case. The internal diff has an option to ignore line endings. (and, at least in trunk (don't know about 1.6), you can set that option i

Re: Error with svn diff

2011-04-27 Thread Tony Butt
On Wed, 2011-04-27 at 02:05 -0500, Ryan Schmidt wrote: > On Apr 26, 2011, at 18:46, Tony Butt wrote: > > > On Fri, 2011-04-15 at 02:31 -0500, Ryan Schmidt wrote: > >> > > > >> Is it possible the document has mixed line ending styles? -- some lines > >> ending with CRLF and some ending with LF?

Re: Error with svn diff

2011-04-27 Thread Ryan Schmidt
On Apr 26, 2011, at 18:46, Tony Butt wrote: > On Fri, 2011-04-15 at 02:31 -0500, Ryan Schmidt wrote: >> > >> 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 prope

Re: Error with svn diff

2011-04-26 Thread Tony Butt
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:57

Re: Error with svn diff

2011-04-15 Thread Ryan Schmidt
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 --diff-cmd=/usr/bin/diff > out.diff) > > and the problem go

Error with svn diff

2011-04-14 Thread Tony Butt
We are using Subversion 1.6.16 on a Ubuntu Lucid box, and a Ubuntu Hardy (8.04) box hosting a subversion 1.6.16 repository via apache. We use this configuration to support codestriker 1.9.10 for code reviews, and have recently hit a problem with some of our reviews. After carefully stepping throug