Home | About | Sematext search-lucene.com search-hadoop.com
 Search Hadoop and all its subprojects:

Switch to Plain View
Hadoop, mail # dev - git line endings trouble since recent trunk


+
Sandy Ryza 2013-06-28, 18:01
+
Zhijie Shen 2013-06-28, 18:54
+
Omkar Joshi 2013-06-28, 19:19
+
Sandy Ryza 2013-06-28, 19:27
Copy link to this message
-
Re: git line endings trouble since recent trunk
Colin McCabe 2013-06-28, 19:56
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-project/hadoop-hdfs/src/main/docs/releasenotes.html
cmccabe@keter:~/hadoopST/trunk>

It might also be a good idea to run dos2unix on it.

I thought that in general we wanted to have 'LF' everywhere, so
perhaps we should add this to the patch.sh script to prevent this from
re-occurring.

Colin
On Fri, Jun 28, 2013 at 12:27 PM, Sandy Ryza <[EMAIL PROTECTED]> wrote:
> 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 <[EMAIL PROTECTED]>wrote:
>
>> Sandy... did you fix this? any jira to track? me too facing same problem..
>>
>> Thanks,
>> Omkar Joshi
>> *Hortonworks Inc.* <http://www.hortonworks.com>
>>
>>
>> On Fri, Jun 28, 2013 at 11:54 AM, Zhijie Shen <[EMAIL PROTECTED]>
>> wrote:
>>
>> > 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 <[EMAIL PROTECTED]
>> > >wrote:
>> >
>> > > 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
>> thing
>> > I
>> > > can do to neutralize it is to put it in a dummy commit, but I have to
>> do
>> > > this every time I switch branches or rebase.
>> > >
>> > > This appears to have began after the release notes commit
>> > >  (8c5676830bb176157b2dc28c48cd3dd0a9712741), and must be due to a line
>> > > endings change.
>> > >
>> > > -Sandy
>> > >
>> >
>> >
>> >
>> > --
>> > Zhijie Shen
>> > Hortonworks Inc.
>> > http://hortonworks.com/
>> >
>>
+
Colin McCabe 2013-06-28, 20:03
+
Doug Cutting 2013-06-29, 04:10
+
Luke Lu 2013-06-30, 00:18
+
Luke Lu 2013-06-30, 00:22
+
Colin McCabe 2013-07-01, 17:42
+
Raja Aluri 2013-07-01, 17:51
+
Alejandro Abdelnur 2013-07-01, 18:00
+
Raja Aluri 2013-07-01, 18:09
+
Colin McCabe 2013-07-01, 18:44
+
Zhijie Shen 2013-08-01, 20:31
+
Robert Parker 2013-08-01, 20:49