CRLF issues on checkout (was Re: Gnucash 2.5/6 - jqplot)

Geert Janssens janssens-geert at telenet.be
Sun Feb 24 04:21:00 EST 2013


Op 23-02-13 17:07, Christian Stimming schreef:
> Am Samstag, 23. Februar 2013, 11:57:18 schrieb Geert Janssens:
>>>>>> Additionally, can you check if the "eol" attribute is already
>>>>>> supported in your git version ? It is mentioned in "man
>>>>>> gitattributes" on my system and is the attribute I'm using to
>>>>>> force consistent line endings. It may be a more recent addition.
> I think the easiest way out here (as long as we're still using SVN) is to set
> the per-file SVN property svn:eol-style to some fixed value (here: LF). This
> ensures the file get one canonical set of eol markers.
>
> However, setting this property requires a client-side action: Either the file
> ~/.subversion/config needs some manual changes as described here
>
>      http://stackoverflow.com/questions/5671406/force-svneol-style-native-on-
> the-server
>
> which sets the property at the initial checkin of each file, or we need to do
> one additional SVN commit to set that property, which I've just done in
> r22809.
>
> Note: For most of our *.h / *.c files I've also done this manually in e.g.
> r20217 or r18959, which explains why we didn't have any trouble with those
> files and line endings. I strongly suggest for every developer to modify one's
> own ~/.subversion/config to set svn:eol-style=LF for *.h, *.c so that we
> continue with a consistent setting of the line endings.
>
> As for git: The gitattributes feature is probably the most closely matching
> feature of git, related to the svn:eol-style property. Once git-1.8 has been
> distributed widely enough, we probably will have this problem solved with
> git's gitattributes file on the git side as well. Until then, we should
> probably keep an eye on setting svn:eol-style correctly.
>
> Regards,
>
> Christian
You are not saying this explicitly, but should I conclude from your 
explanation that the .gitattributes file is new in git-1.8 ? I thought 
it was introduced in git 1.7.2 [1]. But if it was later, that certainly 
would explain why it worked on my system and not on Mike's or John's.

Geert

[1] At least that's what Tim Clem claims in his blog 
:http://timclem.wordpress.com/2012/03/01/mind-the-end-of-your-line/


More information about the gnucash-devel mailing list