[Webkit-unassigned] [Bug 53625] svn-apply and/or patch(1) has trouble applying patches that makes changes to files with Windows line endings

bugzilla-daemon at webkit.org bugzilla-daemon at webkit.org
Mon Mar 14 12:02:40 PDT 2011


https://bugs.webkit.org/show_bug.cgi?id=53625





--- Comment #10 from Daniel Bates <dbates at webkit.org>  2011-03-14 12:02:40 PST ---
(In reply to comment #9)
> I discussed my theory about this on IRC once, and just told dbates about it in an email reply, but thought I'd share it here. There is a .gitattributes file in our tree. It forces CRLF on some file types, including *.vcproj files:
> 
> $ grep crlf .gitattributes | wc -l
> 226
> $ grep vcproj .gitattributes 
> *.vcproj eol=crlf
> $ 
> 

Older versions of Git (e.g. 1.7.0.3) do not support the eol attribute. Instead, the line endings for checked out files are influenced by various factors, including the value of core.autocrlf.

>From a brief check, our .vcproj files have svn:eol-style native. We should look to have both Git and SVN match. Additionally, we should either consider requiring a minimum version of Git (that support the eol attribute) and/or  teach svn-apply/svn-unapply how to compensate for older Git versions.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.



More information about the webkit-unassigned mailing list