Re: [webkit-dev] sln files with wrong line endings

2013-02-17 Thread Dean Jackson
On 14/02/2013, at 6:23 pm, Vivek Galatage vivekgalat...@gmail.com wrote: I had the same problem and was able to trace the reason for this. http://stackoverflow.com/questions/1889559/git-diff-to-ignore-m Its the ^M characters at the EOL. git diff --ignore-space-at-eol ignores the change

Re: [webkit-dev] sln files with wrong line endings

2013-02-14 Thread Rafael Brandao
This also happened to me, quite annoying. :-( I've followed the thread https://groups.google.com/a/chromium.org/forum/?fromgroups=#!topic/chromium-dev/YpKL4xiJHPQ and did the following: editing .gitattributes to disable the eol=crlf flag for .sln files, then doing a reset/checkout, then un-editing

Re: [webkit-dev] sln files with wrong line endings

2013-02-14 Thread Darin Adler
Typically in Subversion the fix for a problem like this is to set the eol-style explicitly; presumably to CRLF for Windows project and solution files and to LF or native for plain old source files. Once that property is set, people changing file later on can’t cause problems with inconsistent

Re: [webkit-dev] sln files with wrong line endings

2013-02-14 Thread Adam Roben
I'm pretty sure r142864 fixed this (perhaps unintentionally) by changing all line endings in DumpRenderTree.sln from CRLF to LF. On Thu, Feb 14, 2013 at 11:11 AM, Darin Adler da...@apple.com wrote: Typically in Subversion the fix for a problem like this is to set the eol-style explicitly;

Re: [webkit-dev] sln files with wrong line endings

2013-02-14 Thread Osztrogonác Csaba
Hi All, Here is an old bug report about it: Files with CRLF lineendigs without svn:eol-style=native kills git svn repositories https://bugs.webkit.org/show_bug.cgi?id=96934 The general fix would be to force all Windows project file have svn:eol-style=native svn property. git-svn users who

Re: [webkit-dev] sln files with wrong line endings

2013-02-13 Thread Christophe Dumez - SISA
Hi, The same thing has just happened to me. I managed to get rid of the changes to this file by doing: git reset --hard Kr, Christope Dumez. From: webkit-dev-boun...@lists.webkit.org [webkit-dev-boun...@lists.webkit.org] on behalf of Eric Seidel