commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Luc Maisonobe <Luc.Maison...@free.fr>
Subject Re: svn commit: r1311904 [1/2] - in /commons/proper/collections/trunk: ./ src/main/java/org/apache/commons/collections/ src/main/java/org/apache/commons/collections/functors/ src/main/java/org/apache/commons/collections/list/difference/ src/test/java
Date Tue, 10 Apr 2012 19:23:37 GMT
Le 10/04/2012 21:00, Konstantin Kolinko a écrit :
> 2012/4/10 Matt Benson <gudnabrsam@gmail.com>:
>> Hi Luc,
>>  What are all these changed files?  :/
>>
> 
> Apparently it is because of setting svn:eol-style=native.
> 
> Subversion internally stores "native" eolns as LF.  The files
> apparently used Windows line ends, and so the diffs from converting
> 'CRLF' -> 'LF' are huge.
> 
> Such changes are better be done in a separate commit.
> 
> It is possible to use one of "colored" diff formats in viewwc to review this:
> http://svn.apache.org/viewvc?view=revision&revision=1311904&diff_format=l

I confirm this is a line-endings problem.
I checked out both 1311903 and current version with a regular svn client
and compared accurately the files using an external diff with option -w
to ignore all spaces (including line-endings). With this settings only
the expansion of the various $Revision$ keywords remained as a difference.

All the changed files missed the svn:eol-style=native property, which is
set for all other files (and also for the new files I created).

As a cross check, I manually reencoded the file endings on one work copy
using the "recode" linux command and performed a diff again, without
using the -w flag (i.e. not ignoring white space anymore). Once again,
only the $revision$ keywords are different.

Now that the files are checked in with a correct line-ending, I guess we
could at least add the missing svn:eol-style=native property. With the
current state of the files, it would not produce much noise.

Once again, I'm really sorry
Luc

> 
> 
> Best regards,
> Konstantin Kolinko
> 
>>
>> On Tue, Apr 10, 2012 at 1:22 PM,  <luc@apache.org> wrote:
>>> Author: luc
>>> Date: Tue Apr 10 18:22:29 2012
>>> New Revision: 1311904
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1311904&view=rev
>>> Log:
>>> Added an implementation of Eugene Myers difference algorithm.
>>>
>>> JIRA: COLLECTIONS-404
>>>
>>> Added:
>>>    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/difference/
>>>    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/difference/CommandVisitor.java
  (with props)
>>>    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/difference/DeleteCommand.java
  (with props)
>>>    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/difference/EditCommand.java
  (with props)
>>>    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/difference/EditScript.java
  (with props)
>>>    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/difference/InsertCommand.java
  (with props)
>>>    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/difference/KeepCommand.java
  (with props)
>>>    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/difference/ReplacementsFinder.java
  (with props)
>>>    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/difference/ReplacementsHandler.java
  (with props)
>>>    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/difference/SequencesComparator.java
  (with props)
>>>    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/difference/Snake.java
  (with props)
>>>    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/list/difference/package.html
  (with props)
>>>    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/list/difference/
>>>    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/list/difference/SequencesComparatorTest.java
  (with props)
>>> Modified:
>>>    commons/proper/collections/trunk/pom.xml
>>>    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/IndexedCollection.java
>>>    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java
>>>    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java
>>>    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/AbstractDecoratedCollectionTest.java
>>>    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/MockTestCase.java
>>>    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestIndexedCollection.java
>>>    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/BasicClosureTestBase.java
>>>    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestCatchAndRethrowClosure.java
>>>    commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestComparatorPredicate.java
>>>
> 
> (...)
>>> Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/IndexedCollection.java
>>> URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/IndexedCollection.java?rev=1311904&r1=1311903&r2=1311904&view=diff
>>> ==============================================================================
>>> --- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/IndexedCollection.java
(original)
>>> +++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/IndexedCollection.java
Tue Apr 10 18:22:29 2012
>>> @@ -1,136 +1,136 @@
>>> -/*
>>> - * Licensed to the Apache Software Foundation (ASF) under one or more
>>> - * contributor license agreements.  See the NOTICE file distributed with
>>> - * this work for additional information regarding copyright ownership.
>>> - * The ASF licenses this file to You 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
> (...)
>>> +/*
>>> + * Licensed to the Apache Software Foundation (ASF) under one or more
>>> + * contributor license agreements.  See the NOTICE file distributed with
>>> + * this work for additional information regarding copyright ownership.
>>> + * The ASF licenses this file to You 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
> 
> Best regards,
> Konstantin Kolinko
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
> 
> 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Mime
View raw message