harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Mark Hindess" <mark.hind...@googlemail.com>
Subject Re: svn commit: r388415 [2/3] - in /incubator/harmony/enhanced/classlib/trunk: modules/archive/src/test/java/tests/api/java/util/zip/ modules/beans/src/main/java/java/beans/beancontext/ modules/luni/src/test/java/tests/api/java/lang/ modules/luni/src
Date Fri, 24 Mar 2006 19:01:06 GMT
The original patch was a neat, brief unix diff.  (Not an "svn diff"
since I'm using quilt to stack my changes until they get committed.)

The unix diff metadata lines - i.e. the 'Index:', '+++', '---' and
'@@' offset lines always contain unix line endings where as the line
endings for the actual file fragments match the original file line
endings.  Since most of our files have dos line endings, we end up
with a patch file that has a mix of line endings.  These files are
obviously confusing some tools.

Regards,
 Mark.

On 3/24/06, Geir Magnusson Jr <geir@pobox.com> wrote:
> Um. Odd.  How big was the patch?  We might have eol-style set wrong...?
>
> geir
>
>
> Tim Ellison wrote:
> > I assume that these large diffs are produced by an EOL difference
> > between the original and patched files...
> >
> > Regards,
> > Tim
> >
> > tellison@apache.org wrote:
> >> Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
> >> URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java?rev=388415&r1=388414&r2=388415&view=diff
> >> ==============================================================================
> >> --- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
(original)
> >> +++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
Thu Mar 23 22:53:45 2006
> >> @@ -1,1336 +1,1336 @@
> >> -/*
> >> - *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
> >> - *
> >> - *  Licensed under the Apache License, Version 2.0 (the "License");
> >> - *  you may not use this file except in compliance with the License.
> >> - *  You may obtain a copy of the License at
> >> - *
> >> - *     http://www.apache.org/licenses/LICENSE-2.0
> >> - *
> >> - *  Unless required by applicable law or agreed to in writing, software
> >> - *  distributed under the License is distributed on an "AS IS" BASIS,
> >> - *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> >> - *  See the License for the specific language governing permissions and
> >> - *  limitations under the License.
> >> - */
> >> -
[SNIP]

Mime
View raw message