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

Re: Error with svn diff

From: Ryan Schmidt <subversion-2011a_at_ryandesign.com>
Date: Wed, 27 Apr 2011 02:05:04 -0500

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 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.

If you can afford to take the repository offline for awhile, and force everybody to check out new working copies, you can fix your historical line endings by using svndumptool's eolfix option.

http://svn.borg.ch/svndumptool/

> 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.

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 script in the repository that absolutely prevents the problem from happening in the future. If you've decided for example that .txt files shall have the svn:eol-style set to native, then write and install a pre-commit hook script that prevents anyone from adding any .txt file that does not have svn:eol-style set to native.
Received on 2011-04-27 09:05:49 CEST

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