lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mark Miller <markrmil...@gmail.com>
Subject Re: svn commit: r790581 - /lucene/java/trunk/src/java/org/apache/lucene/search/RangeTermEnum.java
Date Thu, 02 Jul 2009 14:05:57 GMT
Thats a pretty simple conflict resolution.

I think trying to lock down code while issues are in progress is 
generally not a great idea. More cons than pros in my mind. Generally, 
the onus is on the patch writer to continue to resolve conflicts until 
they commit AFAICT.

That said, I have no plans to modify those classes in the near term, and 
if I find cause, I'll hold off for now.

- Mark

Uwe Schindler wrote:
> Hrrrrrm, my work for LUCENE-1713 conflicted... I already added this to the
> renamed class.
>
> Please do not commit any changes to Range* classes before LUCENE-1713 is
> resolved.
>
> -----
> Uwe Schindler
> H.-H.-Meier-Allee 63, D-28213 Bremen
> http://www.thetaphi.de
> eMail: uwe@thetaphi.de
>
>   
>> -----Original Message-----
>> From: markrmiller@apache.org [mailto:markrmiller@apache.org]
>> Sent: Thursday, July 02, 2009 3:25 PM
>> To: java-commits@lucene.apache.org
>> Subject: svn commit: r790581 -
>> /lucene/java/trunk/src/java/org/apache/lucene/search/RangeTermEnum.java
>>
>> Author: markrmiller
>> Date: Thu Jul  2 13:25:08 2009
>> New Revision: 790581
>>
>> URL: http://svn.apache.org/viewvc?rev=790581&view=rev
>> Log:
>> missing Apache license header
>>
>> Modified:
>>     lucene/java/trunk/src/java/org/apache/lucene/search/RangeTermEnum.java
>>
>> Modified:
>> lucene/java/trunk/src/java/org/apache/lucene/search/RangeTermEnum.java
>> URL:
>> http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/
>> search/RangeTermEnum.java?rev=790581&r1=790580&r2=790581&view=diff
>> ==========================================================================
>> ====
>> --- lucene/java/trunk/src/java/org/apache/lucene/search/RangeTermEnum.java
>> (original)
>> +++ lucene/java/trunk/src/java/org/apache/lucene/search/RangeTermEnum.java
>> Thu Jul  2 13:25:08 2009
>> @@ -1,5 +1,22 @@
>>  package org.apache.lucene.search;
>>
>> +/**
>> + * 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
>> + *
>> + * 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.
>> + */
>> +
>>  import java.io.IOException;
>>  import java.text.Collator;
>>
>>
>>     
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: java-dev-help@lucene.apache.org
>
>   


-- 
- Mark

http://www.lucidimagination.com




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


Mime
View raw message