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: r812983 - /lucene/java/trunk/CHANGES.txt
Date Wed, 09 Sep 2009 15:17:12 GMT
Nevermind - I missread - I removed your changes entry - sorry!

Eclipse told me there was a conflict, but something was screwed up
because it showed the diff as just
my additions, and not that I was removing anything. Sorry about that -
I'll put your Changes back in.

- Mark

Mark Miller wrote:
> Ah - thats why I was so confused - it said I had a conflict with your
> change, but I couldn't figure out what it was - it appeared there was no
> conflict, so I resolved it and went ahead. Didn't possibly occur to me
> that you would be doing the same thing.
>
> What is out of whack with it now? I'll take a look at your commit ...
>
> Uwe Schindler wrote:
>   
>> Why did you remove LUCENE-1901 again? I committed this short time ago.
>>
>> -----
>> 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: Wednesday, September 09, 2009 4:58 PM
>>> To: java-commits@lucene.apache.org
>>> Subject: svn commit: r812983 - /lucene/java/trunk/CHANGES.txt
>>>
>>> Author: markrmiller
>>> Date: Wed Sep  9 14:57:42 2009
>>> New Revision: 812983
>>>
>>> URL: http://svn.apache.org/viewvc?rev=812983&view=rev
>>> Log:
>>> merge LUCENE-1483: Added new MultiReaderHitCollector... into LUCENE-1575
>>>
>>> Modified:
>>>     lucene/java/trunk/CHANGES.txt
>>>
>>> Modified: lucene/java/trunk/CHANGES.txt
>>> URL:
>>> http://svn.apache.org/viewvc/lucene/java/trunk/CHANGES.txt?rev=812983&r1=8
>>> 12982&r2=812983&view=diff
>>> ==========================================================================
>>> ====
>>> --- lucene/java/trunk/CHANGES.txt (original)
>>> +++ lucene/java/trunk/CHANGES.txt Wed Sep  9 14:57:42 2009
>>> @@ -248,11 +248,6 @@
>>>     newly added NoSuchDirectoryException if the directory does not
>>>     exist.  (Marcel Reutegger, Mike McCandless)
>>>
>>> - * LUCENE-1483: Added new MultiReaderHitCollector which enables faster
>>> -   hit collection by notifying the collector for each sub-reader
>>> -   that's visited.  All core collectors now use this API.  (Mark
>>> -   Miller, Mike McCandless)
>>> -
>>>   * LUCENE-1546: Add IndexReader.flush(Map commitUserData), allowing
>>>     you to record an opaque commitUserData (maps String -> String) into
>>>     the commit written by IndexReader.  This matches IndexWriter's
>>> @@ -269,13 +264,13 @@
>>>      to denote issues when offsets in TokenStream tokens exceed the length
>>> of the
>>>      provided text.  (Mark Harwood)
>>>
>>> - * LUCENE-1575: HitCollector is now deprecated in favor of a new
>>> -    Collector abstract class. For easy migration, people can use
>>> + * LUCENE-1575, LUCENE-1483: HitCollector is now deprecated in favor of
>>> +    a new Collector abstract class. For easy migration, people can use
>>>      HitCollectorWrapper which translates (wraps) HitCollector into
>>>      Collector. Note that this class is also deprecated and will be
>>>      removed when HitCollector is removed.  Also TimeLimitedCollector
>>>      is deprecated in favor of the new TimeLimitingCollector which
>>> -    extends Collector.  (Shai Erera via Mike McCandless)
>>> +    extends Collector.  (Shai Erera, Mark Miller, Mike McCandless)
>>>
>>>   * LUCENE-1592: The method TermsEnum.skipTo() was deprecated, because
>>>      it is used nowhere in core/contrib and there is only a very
>>> ineffective
>>> @@ -553,9 +548,6 @@
>>>     OpenBitSet, due to an inefficiency in how the underlying storage is
>>>     reallocated.  (Nadav Har'El via Mike McCandless)
>>>
>>> - * LUCENE-1901: Fix the bug that TermAttributeImpl.equals() does not
>>> check
>>> -   termLength.  (Daniel Shane, Doron Cohen via Uwe Schindler)
>>> -
>>>  New features
>>>
>>>   * LUCENE-1411: Added expert API to open an IndexWriter on a prior
>>>
>>>     
>>>       
>>
>> ---------------------------------------------------------------------
>> 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