You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomee.apache.org by Thiago Veronezi <th...@veronezi.org> on 2015/11/23 20:41:29 UTC
about to commit 802 files removing ˆM
Guys,
anyone against a huge commit of 802 file in order to remove the ˆM chars?
I'm about to do it...
tveronezi@ubatuba:tomee$ git diff d6a840ece46ededd9c9dab410a61c1c439536417
fe7e0d9b102db43b4dbbe4bdbd284ecbcfa86a64
server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
diff --git
a/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
b/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
index 19fbf31..5696c61 100644
--- a/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
+++ b/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
@@ -1,3 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>^M
+<!--^M
+^M
+ Licensed to the Apache Software Foundation (ASF) under one or more^M
+ contributor license agreements. See the NOTICE file distributed with^M
+ this work for additional information regarding copyright ownership.^M
+ The ASF licenses this file to You under the Apache License, Version
2.0^M
+ (the "License"); you may not use this file except in compliance with^M
+ the License. You may obtain a copy of the License at^M
+^M
+ http://www.apache.org/licenses/LICENSE-2.0^M
+^M
+ Unless required by applicable law or agreed to in writing, software^M
+ distributed under the License is distributed on an "AS IS" BASIS,^M
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.^M
+ See the License for the specific language governing permissions and^M
+ limitations under the License.^M
+-->^M
+^M
+<!-- $Rev$ $Date$ -->^M
+^M
<xsd:schema
targetNamespace="X"
xmlns:tns="X"
tveronezi@ubatuba:tomee$
[]s,
Thiago.
Re: about to commit 802 files removing ˆM
Posted by Andy <an...@gmx.de>.
Go for it Thiago. Someone has to do it ;-)
On 23/11/2015 20:41, Thiago Veronezi wrote:
> Guys,
> anyone against a huge commit of 802 file in order to remove the ˆM chars?
> I'm about to do it...
>
> tveronezi@ubatuba:tomee$ git diff d6a840ece46ededd9c9dab410a61c1c439536417
> fe7e0d9b102db43b4dbbe4bdbd284ecbcfa86a64
> server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> diff --git
> a/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> b/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> index 19fbf31..5696c61 100644
> --- a/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> +++ b/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> @@ -1,3 +1,24 @@
> +<?xml version="1.0" encoding="UTF-8"?>^M
> +<!--^M
> +^M
> + Licensed to the Apache Software Foundation (ASF) under one or more^M
> + contributor license agreements. See the NOTICE file distributed with^M
> + this work for additional information regarding copyright ownership.^M
> + The ASF licenses this file to You under the Apache License, Version
> 2.0^M
> + (the "License"); you may not use this file except in compliance with^M
> + the License. You may obtain a copy of the License at^M
> +^M
> + http://www.apache.org/licenses/LICENSE-2.0^M
> +^M
> + Unless required by applicable law or agreed to in writing, software^M
> + distributed under the License is distributed on an "AS IS" BASIS,^M
> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> implied.^M
> + See the License for the specific language governing permissions and^M
> + limitations under the License.^M
> +-->^M
> +^M
> +<!-- $Rev$ $Date$ -->^M
> +^M
> <xsd:schema
> targetNamespace="X"
> xmlns:tns="X"
> tveronezi@ubatuba:tomee$
>
>
> []s,
> Thiago.
>
--
Andy Gumbrecht
https://twitter.com/AndyGeeDe
Re: about to commit 802 files removing ˆM
Posted by Andy <an...@gmx.de>.
I posted comprehensively on this already. The rules here must be
followed else issues will continue to arise:
https://help.github.com/articles/dealing-with-line-endings/
There can be no left or right on this. Please make sure you are
correctly configured for your OS.
Andy.
On 23/11/2015 21:04, Romain Manni-Bucau wrote:
> We need a gitconfig sample. I use line ending lf and input config.
>
> Seems ok with current source.
>
> Anyway if we need any formatting code please do it this week or never.
> Le 23 nov. 2015 20:59, "Thiago Veronezi" <th...@veronezi.org> a écrit :
>
>> With the recent changes in
>> https://github.com/apache/tomee/commits/master/.gitattributes, git keeps
>> complaining about these files.
>> []s,
>> Thiago.
>>
>>
>> On Mon, Nov 23, 2015 at 2:55 PM, Mark Struberg <st...@yahoo.de> wrote:
>>
>>> do we already have any policy for line endings?
>>> I’m usually doing checkout as is, commit as is…
>>>
>>> I think the potential loss of author info is worse than having mixed line
>>> endings.
>>> Modern editors can cope with it really well…
>>>
>>> LieGrue,
>>> strub
>>>
>>>> Am 23.11.2015 um 20:41 schrieb Thiago Veronezi <th...@veronezi.org>:
>>>>
>>>> Guys,
>>>> anyone against a huge commit of 802 file in order to remove the ˆM
>> chars?
>>>> I'm about to do it...
>>>>
>>>> tveronezi@ubatuba:tomee$ git diff
>>> d6a840ece46ededd9c9dab410a61c1c439536417
>>>> fe7e0d9b102db43b4dbbe4bdbd284ecbcfa86a64
>>>> server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
>>>> diff --git
>>>>
>> a/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
>> b/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
>>>> index 19fbf31..5696c61 100644
>>>> ---
>>> a/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
>>>> +++
>>> b/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
>>>> @@ -1,3 +1,24 @@
>>>> +<?xml version="1.0" encoding="UTF-8"?>^M
>>>> +<!--^M
>>>> +^M
>>>> + Licensed to the Apache Software Foundation (ASF) under one or
>> more^M
>>>> + contributor license agreements. See the NOTICE file distributed
>>> with^M
>>>> + this work for additional information regarding copyright
>>> ownership.^M
>>>> + The ASF licenses this file to You under the Apache License,
>> Version
>>>> 2.0^M
>>>> + (the "License"); you may not use this file except in compliance
>>> with^M
>>>> + the License. You may obtain a copy of the License at^M
>>>> +^M
>>>> + http://www.apache.org/licenses/LICENSE-2.0^M
>>>> +^M
>>>> + Unless required by applicable law or agreed to in writing,
>>> software^M
>>>> + distributed under the License is distributed on an "AS IS"
>> BASIS,^M
>>>> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>>>> implied.^M
>>>> + See the License for the specific language governing permissions
>>> and^M
>>>> + limitations under the License.^M
>>>> +-->^M
>>>> +^M
>>>> +<!-- $Rev$ $Date$ -->^M
>>>> +^M
>>>> <xsd:schema
>>>> targetNamespace="X"
>>>> xmlns:tns="X"
>>>> tveronezi@ubatuba:tomee$
>>>>
>>>>
>>>> []s,
>>>> Thiago.
--
Andy Gumbrecht
https://twitter.com/AndyGeeDe
Re: about to commit 802 files removing ˆM
Posted by Romain Manni-Bucau <rm...@gmail.com>.
We need a gitconfig sample. I use line ending lf and input config.
Seems ok with current source.
Anyway if we need any formatting code please do it this week or never.
Le 23 nov. 2015 20:59, "Thiago Veronezi" <th...@veronezi.org> a écrit :
> With the recent changes in
> https://github.com/apache/tomee/commits/master/.gitattributes, git keeps
> complaining about these files.
> []s,
> Thiago.
>
>
> On Mon, Nov 23, 2015 at 2:55 PM, Mark Struberg <st...@yahoo.de> wrote:
>
> >
> > do we already have any policy for line endings?
> > I’m usually doing checkout as is, commit as is…
> >
> > I think the potential loss of author info is worse than having mixed line
> > endings.
> > Modern editors can cope with it really well…
> >
> > LieGrue,
> > strub
> >
> > > Am 23.11.2015 um 20:41 schrieb Thiago Veronezi <th...@veronezi.org>:
> > >
> > > Guys,
> > > anyone against a huge commit of 802 file in order to remove the ˆM
> chars?
> > > I'm about to do it...
> > >
> > > tveronezi@ubatuba:tomee$ git diff
> > d6a840ece46ededd9c9dab410a61c1c439536417
> > > fe7e0d9b102db43b4dbbe4bdbd284ecbcfa86a64
> > > server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> > > diff --git
> > >
> a/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> > >
> b/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> > > index 19fbf31..5696c61 100644
> > > ---
> > a/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> > > +++
> > b/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> > > @@ -1,3 +1,24 @@
> > > +<?xml version="1.0" encoding="UTF-8"?>^M
> > > +<!--^M
> > > +^M
> > > + Licensed to the Apache Software Foundation (ASF) under one or
> more^M
> > > + contributor license agreements. See the NOTICE file distributed
> > with^M
> > > + this work for additional information regarding copyright
> > ownership.^M
> > > + The ASF licenses this file to You under the Apache License,
> Version
> > > 2.0^M
> > > + (the "License"); you may not use this file except in compliance
> > with^M
> > > + the License. You may obtain a copy of the License at^M
> > > +^M
> > > + http://www.apache.org/licenses/LICENSE-2.0^M
> > > +^M
> > > + Unless required by applicable law or agreed to in writing,
> > software^M
> > > + distributed under the License is distributed on an "AS IS"
> BASIS,^M
> > > + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> > > implied.^M
> > > + See the License for the specific language governing permissions
> > and^M
> > > + limitations under the License.^M
> > > +-->^M
> > > +^M
> > > +<!-- $Rev$ $Date$ -->^M
> > > +^M
> > > <xsd:schema
> > > targetNamespace="X"
> > > xmlns:tns="X"
> > > tveronezi@ubatuba:tomee$
> > >
> > >
> > > []s,
> > > Thiago.
> >
> >
>
Re: about to commit 802 files removing ˆM
Posted by Thiago Veronezi <th...@veronezi.org>.
With the recent changes in
https://github.com/apache/tomee/commits/master/.gitattributes, git keeps
complaining about these files.
[]s,
Thiago.
On Mon, Nov 23, 2015 at 2:55 PM, Mark Struberg <st...@yahoo.de> wrote:
>
> do we already have any policy for line endings?
> I’m usually doing checkout as is, commit as is…
>
> I think the potential loss of author info is worse than having mixed line
> endings.
> Modern editors can cope with it really well…
>
> LieGrue,
> strub
>
> > Am 23.11.2015 um 20:41 schrieb Thiago Veronezi <th...@veronezi.org>:
> >
> > Guys,
> > anyone against a huge commit of 802 file in order to remove the ˆM chars?
> > I'm about to do it...
> >
> > tveronezi@ubatuba:tomee$ git diff
> d6a840ece46ededd9c9dab410a61c1c439536417
> > fe7e0d9b102db43b4dbbe4bdbd284ecbcfa86a64
> > server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> > diff --git
> > a/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> > b/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> > index 19fbf31..5696c61 100644
> > ---
> a/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> > +++
> b/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> > @@ -1,3 +1,24 @@
> > +<?xml version="1.0" encoding="UTF-8"?>^M
> > +<!--^M
> > +^M
> > + Licensed to the Apache Software Foundation (ASF) under one or more^M
> > + contributor license agreements. See the NOTICE file distributed
> with^M
> > + this work for additional information regarding copyright
> ownership.^M
> > + The ASF licenses this file to You under the Apache License, Version
> > 2.0^M
> > + (the "License"); you may not use this file except in compliance
> with^M
> > + the License. You may obtain a copy of the License at^M
> > +^M
> > + http://www.apache.org/licenses/LICENSE-2.0^M
> > +^M
> > + Unless required by applicable law or agreed to in writing,
> software^M
> > + distributed under the License is distributed on an "AS IS" BASIS,^M
> > + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> > implied.^M
> > + See the License for the specific language governing permissions
> and^M
> > + limitations under the License.^M
> > +-->^M
> > +^M
> > +<!-- $Rev$ $Date$ -->^M
> > +^M
> > <xsd:schema
> > targetNamespace="X"
> > xmlns:tns="X"
> > tveronezi@ubatuba:tomee$
> >
> >
> > []s,
> > Thiago.
>
>
Re: about to commit 802 files removing ˆM
Posted by Mark Struberg <st...@yahoo.de>.
do we already have any policy for line endings?
I’m usually doing checkout as is, commit as is…
I think the potential loss of author info is worse than having mixed line endings.
Modern editors can cope with it really well…
LieGrue,
strub
> Am 23.11.2015 um 20:41 schrieb Thiago Veronezi <th...@veronezi.org>:
>
> Guys,
> anyone against a huge commit of 802 file in order to remove the ˆM chars?
> I'm about to do it...
>
> tveronezi@ubatuba:tomee$ git diff d6a840ece46ededd9c9dab410a61c1c439536417
> fe7e0d9b102db43b4dbbe4bdbd284ecbcfa86a64
> server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> diff --git
> a/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> b/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> index 19fbf31..5696c61 100644
> --- a/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> +++ b/server/openejb-axis/src/test/resources/schema/SoapArrayByAttribute.xsd
> @@ -1,3 +1,24 @@
> +<?xml version="1.0" encoding="UTF-8"?>^M
> +<!--^M
> +^M
> + Licensed to the Apache Software Foundation (ASF) under one or more^M
> + contributor license agreements. See the NOTICE file distributed with^M
> + this work for additional information regarding copyright ownership.^M
> + The ASF licenses this file to You under the Apache License, Version
> 2.0^M
> + (the "License"); you may not use this file except in compliance with^M
> + the License. You may obtain a copy of the License at^M
> +^M
> + http://www.apache.org/licenses/LICENSE-2.0^M
> +^M
> + Unless required by applicable law or agreed to in writing, software^M
> + distributed under the License is distributed on an "AS IS" BASIS,^M
> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> implied.^M
> + See the License for the specific language governing permissions and^M
> + limitations under the License.^M
> +-->^M
> +^M
> +<!-- $Rev$ $Date$ -->^M
> +^M
> <xsd:schema
> targetNamespace="X"
> xmlns:tns="X"
> tveronezi@ubatuba:tomee$
>
>
> []s,
> Thiago.