git line endings trouble since recent trunk

Has anybody else been having trouble with line endings since pulling trunk recently? hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html shows up as modified even though I haven't touched it, and I can't check it out or reset to a previous version to make that go away. The only th

Re: git line endings trouble since recent trunk

Have the same problem here, have to edit the patch manually to exclude the changes in releasenotes.html On Fri, Jun 28, 2013 at 11:01 AM, Sandy Ryza wrote: > Has anybody else been having trouble with line endings since pulling trunk > recently? > > hadoop-common-project/hadoop-common/src/main/do

Re: git line endings trouble since recent trunk

Sandy... did you fix this? any jira to track? me too facing same problem.. Thanks, Omkar Joshi *Hortonworks Inc.* On Fri, Jun 28, 2013 at 11:54 AM, Zhijie Shen wrote: > Have the same problem here, have to edit the patch manually to exclude the > changes in releasen

Re: git line endings trouble since recent trunk

I haven't been able to find a solution. Just filed https://issues.apache.org/jira/browse/HADOOP-9675. On Fri, Jun 28, 2013 at 12:19 PM, Omkar Joshi wrote: > Sandy... did you fix this? any jira to track? me too facing same problem.. > > Thanks, > Omkar Joshi > *Hortonworks Inc.*

Re: git line endings trouble since recent trunk

I think the fix for this is to set svn:eol-style to "native" on this file. It's set on many other files, just not on this one: cmccabe@keter:~/hadoopST/trunk> svn propget svn:eol-style ./hadoop-project-dist/README.txt native cmccabe@keter:~/hadoopST/trunk> svn propget svn:eol-style ./hadoop-hdfs-

Re: git line endings trouble since recent trunk

Clarification: svn:eol-style = native causes the files to contain whatever the native platform used to check out the code uses. I think just setting this property on all the HTML files should resolve this and future problems. patch posted. C. On Fri, Jun 28, 2013 at 12:56 PM, Colin McCabe wrote

Re: git line endings trouble since recent trunk

http://www.apache.org/dev/version-control.html#https-svn-config Doug On Jun 28, 2013 1:03 PM, "Colin McCabe" wrote: > Clarification: svn:eol-style = native causes the files to contain > whatever the native platform used to check out the code uses. I think > just setting this property on all the

Re: git line endings trouble since recent trunk

The problem is due to relnotes.py generating the html containing some CRLF (from JIRA) and the release manager not using git-svn, which caused the html with mixed eol getting checked in. The problem would then manifest for git users due to text=auto in .gitattributes (see HADOOP-8912) that auto con

Re: git line endings trouble since recent trunk

BTW, I just checked in the eol fix for the releasenotes.html, so git users wouldn't be annoyed until the next relnotes.py run :) On Sat, Jun 29, 2013 at 5:18 PM, Luke Lu wrote: > The problem is due to relnotes.py generating the html containing some CRLF > (from JIRA) and the release manager not

Re: git line endings trouble since recent trunk

On Sat, Jun 29, 2013 at 5:18 PM, Luke Lu wrote: > The problem is due to relnotes.py generating the html containing some CRLF > (from JIRA) and the release manager not using git-svn, which caused the > html with mixed eol getting checked in. The problem would then manifest for > git users due to te

Re: git line endings trouble since recent trunk

I added a couple of links that discusses 'line endings' when I added .gitattributes in this JIRA. HADOOP-8912 I am just reproducing them here. 1. http://git-scm.com/docs/gitattributes#_checking_out_and_checking_in 2. http://stackoverflo

Re: git line endings trouble since recent trunk

why not just add a precommit hook in svn to reject commits with CRLF? On Mon, Jul 1, 2013 at 10:51 AM, Raja Aluri wrote: > I added a couple of links that discusses 'line endings' when I added > .gitattributes in this JIRA. > HADOOP-8912 > > I a

Re: git line endings trouble since recent trunk

They are not that many that I can think of unless you are using notepad for editing, but some of the windows related files might require CRLF. This can be handled in .gitattributes I think it's a very good idea to add this check to test-patch script and reject the patch based on the CRLF check. -Ra

Re: git line endings trouble since recent trunk

On Mon, Jul 1, 2013 at 11:09 AM, Raja Aluri wrote: > They are not that many that I can think of unless you are using notepad for > editing, but some of the windows related files might require CRLF. This can > be handled in .gitattributes > I think it's a very good idea to add this check to test-pa

Re: git line endings trouble since recent trunk

The problem seems to happen again on the latest trunk On Mon, Jul 1, 2013 at 11:44 AM, Colin McCabe wrote: > On Mon, Jul 1, 2013 at 11:09 AM, Raja Aluri wrote: > > They are not that many that I can think of unless you are using notepad > for > > editing, but some of the windows related files mi

Re: git line endings trouble since recent trunk

Yes on hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html. This does not appear to affect devs in my group with older git 1.7.1, but it does affect git 1.8.1.2 and fiddling with the options autocrlf and safecrlf could not produce a combination that prevents it from changing the li