lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Steven A Rowe <sar...@syr.edu>
Subject RE: svn commit: r1038098 - in /lucene/java/branches/lucene_2_9: ./ contrib/ contrib/analyzers/ contrib/analyzers/common/ contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ contrib/analyzers/common/src/test/ contrib/analyzers/common/src/
Date Tue, 23 Nov 2010 13:22:16 GMT
Hi Uwe,

This email and your 3.0 commit email contain propchange diffs - shouldn't these be left out now that Grant changed the svnmailer configuration?

Steve

> -----Original Message-----
> From: uschindler@apache.org [mailto:uschindler@apache.org]
> Sent: Tuesday, November 23, 2010 8:17 AM
> To: java-commits@lucene.apache.org
> Subject: svn commit: r1038098 - in /lucene/java/branches/lucene_2_9: ./
> contrib/ contrib/analyzers/ contrib/analyzers/common/
> contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/
> contrib/analyzers/common/src/test/ contrib/analyzers/common/src/t...
>
> Author: uschindler
> Date: Tue Nov 23 13:17:02 2010
> New Revision: 1038098
>
> URL: http://svn.apache.org/viewvc?rev=1038098&view=rev
> Log:
> Backport LUCENE-2216: OpenBitSet.hashCode fix
>
> Modified:
>     lucene/java/branches/lucene_2_9/   (props changed)
>     lucene/java/branches/lucene_2_9/CHANGES.txt   (contents, props
> changed)
>     lucene/java/branches/lucene_2_9/build.xml   (props changed)
>     lucene/java/branches/lucene_2_9/contrib/   (props changed)
>     lucene/java/branches/lucene_2_9/contrib/CHANGES.txt   (props changed)
>     lucene/java/branches/lucene_2_9/contrib/analyzers/   (props changed)
>     lucene/java/branches/lucene_2_9/contrib/analyzers/common/   (props
> changed)
>
> lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/java/org/apac
> he/lucene/analysis/shingle/   (props changed)
>     lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/test/
> (props changed)
>
> lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/test/org/apac
> he/lucene/analysis/shingle/   (props changed)
>     lucene/java/branches/lucene_2_9/contrib/analyzers/smartcn/   (props
> changed)
>     lucene/java/branches/lucene_2_9/contrib/benchmark/   (props changed)
>     lucene/java/branches/lucene_2_9/contrib/fast-vector-
> highlighter/src/java/org/apache/lucene/search/vectorhighlight/   (props
> changed)
>     lucene/java/branches/lucene_2_9/contrib/fast-vector-
> highlighter/src/test/org/apache/lucene/search/vectorhighlight/   (props
> changed)
>     lucene/java/branches/lucene_2_9/contrib/highlighter/   (props changed)
>     lucene/java/branches/lucene_2_9/contrib/highlighter/src/test/   (props
> changed)
>
> lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/l
> ucene/store/instantiated/TestIndicesEquals.java   (props changed)
>     lucene/java/branches/lucene_2_9/src/   (props changed)
>
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/BaseCh
> arFilter.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Length
> Filter.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Letter
> Tokenizer.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/LowerC
> aseTokenizer.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Tokeni
> zer.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/standa
> rd/   (props changed)
>
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/standa
> rd/StandardFilter.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/standa
> rd/StandardTokenizer.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/standa
> rd/StandardTokenizerImpl.jflex   (props changed)
>
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/tokena
> ttributes/TermAttributeImpl.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTer
> mQueryWrapperFilter.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/util/AttributeS
> ource.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/util/OpenBitSet
> .java
>
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/util/StringHelp
> er.java   (props changed)
>     lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/
> (props changed)
>
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/BaseTo
> kenStreamTestCase.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestIS
> OLatin1AccentFilter.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDa
> teTools.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNu
> mberTools.java   (props changed)
>     lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/
> (props changed)
>
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackw
> ardsCompatibility.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/TestCach
> ingWrapperFilter.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/spans/Te
> stPayloadSpans.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/spans/Te
> stSpans.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttrib
> uteSource.java   (props changed)
>
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestOpenBi
> tSet.java
>
> Propchange: lucene/java/branches/lucene_2_9/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,5 +1,5 @@
>
> /lucene/dev/branches/branch_3x/lucene:941394,946651,948430,957490,957920,9
> 84210,988629,990167,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene:929738,930932,932398,935522,938989,939611,939649,
> 940730,946599,948082,948429,949288,949976,949997,950458,950613,951521,9577
> 07,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,9
> 99842,1034017
>  /lucene/java/branches/lucene_2_4:748824
> -
> /lucene/java/branches/lucene_3_0:886275,889688,891211,899639,900212,908479
> ,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957
> 495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,10287
> 89,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039
> ,1029077,1029138,1029374,1034054
> -
> /lucene/java/trunk:821888,824125,826029,826385,830871,833095,833297,833886
> ,834035,836155,881819,882672,883554,884870,886257,887347,887532,887670,889
> 431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,9
> 19060,919869,920270
> +/lucene/java/branches/lucene_3_0:886275,889688,891211,899639,900212,90847
> 9,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,95
> 7495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028
> 789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,102903
> 9,1029077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk:821888,824125,826029,826385,830871,833095,833297,83388
> 6,834035,836155,881819,882672,883554,884870,886257,887347,887532,887670,88
> 9431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,9
> 16543,919060,919869,920270
>
> Modified: lucene/java/branches/lucene_2_9/CHANGES.txt
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/CHANGES.txt?r
> ev=1038098&r1=1038097&r2=1038098&view=diff
> ==========================================================================
> ====
> --- lucene/java/branches/lucene_2_9/CHANGES.txt (original)
> +++ lucene/java/branches/lucene_2_9/CHANGES.txt Tue Nov 23 13:17:02 2010
> @@ -107,6 +107,9 @@ Bug fixes
>    index size, when compound file is enabled (else 2X).  (Mike
>    McCandless)
>
> +* LUCENE-2216: OpenBitSet.hashCode returned different hash codes for
> +  sets that only differed by trailing zeros. (Dawid Weiss, yonik)
> +
>  Optimizations
>
>  * LUCENE-2556: Improve memory usage after cloning TermAttribute.
>
> Propchange: lucene/java/branches/lucene_2_9/CHANGES.txt
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/CHANGES.txt:941394,946651,948430,957
> 490,957920,984210,1034036
>
> /lucene/dev/trunk/lucene/CHANGES.txt:929738,932398,935522,938989,939611,93
> 9649,940730,946599,948082,948429,949288,949976,949997,950458,950613,951521
> ,957707,963372,963781,965103,965299,984187,989785,994979,1034017
> -
> /lucene/java/branches/lucene_3_0/CHANGES.txt:889688,891211,899639,900212,9
> 08479,909401,912383,915404,940993,948090,948432,950033,950301,950474,95058
> 0,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,
> 1028789,1028873,1028915,1028920,1028931,1029022,1029024,1029039,1029138,10
> 29374,1034054
> -
> /lucene/java/trunk/CHANGES.txt:821888,834035,836155,881819,886257,887347,8
> 87532,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,9
> 19060,919869,920270
> +/lucene/java/branches/lucene_3_0/CHANGES.txt:889688,891211,899639,900212,
> 908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,9505
> 80,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779
> ,1028789,1028873,1028915,1028920,1028931,1029022,1029024,1029039,1029138,1
> 029374,1034054,1038096
> +/lucene/java/trunk/CHANGES.txt:821888,834035,836155,881819,886257,887347,
> 887532,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,9
> 16543,919060,919869,920270
>
> Propchange: lucene/java/branches/lucene_2_9/build.xml
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/build.xml:941394,946651,948430,95749
> 0,957920,984210,988629,990167,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/build.xml:929738,930932,932398,935522,938989,9396
> 11,939649,940730,946599,948082,948429,949288,949976,949997,950458,950613,9
> 51521,957707,963372,963781,965103,965299,984187,989785,990161,990281,99497
> 9,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/build.xml:889688,891211,900212,908479,909
> 401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,
> 963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1
> 028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,102
> 9077,1029138,1029374,1034054
> -/lucene/java/trunk/build.xml:821888,834035,836155,887670,889431-
> 889432,889579,889866,890439,891205,891209,891377,899627,900196,903368,9084
> 77,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
> +/lucene/java/branches/lucene_3_0/build.xml:889688,891211,900212,908479,90
> 9401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495
> ,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,
> 1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,10
> 29077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk/build.xml:821888,834035,836155,887670,889431-
> 889432,889579,889866,890439,891205,891209,891377,899627,900030,900196,9033
> 68,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,9
> 20270
>
> Propchange: lucene/java/branches/lucene_2_9/contrib/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/contrib:941394,946651,948430,957490,
> 957920,984210,988629,990167,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/contrib:929738,930932,932398,935522,938989,939611
> ,939649,940730,946599,948082,948429,949288,949976,949997,950458,950613,951
> 521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,
> 999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/contrib:889688,891211,899639,900212,90847
> 9,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,95
> 7495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028
> 789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,102903
> 9,1029077,1029138,1029374,1034054
> -
> /lucene/java/trunk/contrib:821888,834035,836155,881819,886257,887347,88753
> 2,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,9
> 19060,919869,920270
> +/lucene/java/branches/lucene_3_0/contrib:889688,891211,899639,900212,9084
> 79,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,9
> 57495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,102
> 8789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,10290
> 39,1029077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk/contrib:821888,834035,836155,881819,886257,887347,8875
> 32,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,9
> 16543,919060,919869,920270
>
> Propchange: lucene/java/branches/lucene_2_9/contrib/CHANGES.txt
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt:941394,946651,94
> 8430,957490,957920,984210,988629,990167,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/contrib/CHANGES.txt:929738,930932,932398,935522,9
> 38989,939611,939649,940730,946599,948082,948429,949288,949976,949997,95045
> 8,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,99
> 0281,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/contrib/CHANGES.txt:889688,891211,900212,
> 908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,9505
> 80,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028827
> ,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1
> 029138,1029374,1034054
> -
> /lucene/java/trunk/contrib/CHANGES.txt:821888,834035,836155,887670,889431-
> 889432,889579,889866,890439,891205,891209,891377,899627,900196,903368,9084
> 77,908975,909398,910034,910078,912407,915399,919060,920270
> +/lucene/java/branches/lucene_3_0/contrib/CHANGES.txt:889688,891211,900212
> ,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950
> 580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,102882
> 7,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,
> 1029138,1029374,1034054,1038096
> +/lucene/java/trunk/contrib/CHANGES.txt:821888,834035,836155,887670,889431
> -
> 889432,889579,889866,890439,891205,891209,891377,899627,900030,900196,9033
> 68,908477,908975,909398,910034,910078,912407,915399,919060,920270
>
> Propchange: lucene/java/branches/lucene_2_9/contrib/analyzers/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/contrib/analyzers:941394,946651,9574
> 90,957920,984210,988629,990167,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/contrib/analyzers:930932,939611,940730,949288,950
> 458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,
> 990281,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/contrib/analyzers:950301,950474,950580,95
> 7495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028
> 789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,102903
> 9,1029077,1029138,1029374,1034054
> -
> /lucene/java/trunk/contrib/analyzers:834035,836155,887670,889579,889866,89
> 0439,891205,891377,903368,916543,919869,920270
> +/lucene/java/branches/lucene_3_0/contrib/analyzers:950301,950474,950580,9
> 57495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,102
> 8789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,10290
> 39,1029077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk/contrib/analyzers:834035,836155,887670,889579,889866,8
> 90439,891205,891377,900030,903368,916543,919869,920270
>
> Propchange: lucene/java/branches/lucene_2_9/contrib/analyzers/common/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common:957920,9886
> 29,990167,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/contrib/analyzers/common:930932,957707,963372,965
> 299,989785,990161,990281,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/contrib/analyzers/common:990293,995063,99
> 9228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,10290
> 13,1029022,1029024,1029039,1029077,1029138,1029374,1034054
> -/lucene/java/trunk/contrib/analyzers/common:903368,916543,919869
> +/lucene/java/branches/lucene_3_0/contrib/analyzers/common:990293,995063,9
> 99228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029
> 013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk/contrib/analyzers/common:900030,903368,916543,919869
>
> Propchange:
> lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/java/org/apac
> he/lucene/analysis/shingle/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (added)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -0,0 +1 @@
> +/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/an
> alysis/shingle:900030
>
> Propchange:
> lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/test/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test:95
> 7920,990167,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/contrib/analyzers/common/src/test:930932,957707,9
> 63372,965299,990161,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/test:999228,
> 1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,10
> 29022,1029024,1029039,1029077,1029138,1029374,1034054
> -/lucene/java/trunk/contrib/analyzers/common/src/test:903368,916543,919869
> +/lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/test:999228
> ,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1
> 029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk/contrib/analyzers/common/src/test:900030,903368,916543
> ,919869
>
> Propchange:
> lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/test/org/apac
> he/lucene/analysis/shingle/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (added)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -0,0 +1 @@
> +/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/an
> alysis/shingle:900030
>
> Propchange: lucene/java/branches/lucene_2_9/contrib/analyzers/smartcn/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/contrib/analyzers/smartcn:957920,988
> 629,990167,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/contrib/analyzers/smartcn:930932,957707,963372,96
> 5299,989785,990161,990281,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/contrib/analyzers/smartcn:990293,995063,9
> 99228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029
> 013,1029022,1029024,1029039,1029077,1029138,1029374,1034054
> -/lucene/java/trunk/contrib/analyzers/smartcn:903368,916543,919869
> +/lucene/java/branches/lucene_3_0/contrib/analyzers/smartcn:990293,995063,
> 999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,102
> 9013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk/contrib/analyzers/smartcn:900030,903368,916543,919869
>
> Propchange: lucene/java/branches/lucene_2_9/contrib/benchmark/
> --------------------------------------------------------------------------
> ----
>     svn:mergeinfo = /lucene/java/trunk/contrib/benchmark:900030
>
> Propchange: lucene/java/branches/lucene_2_9/contrib/fast-vector-
> highlighter/src/java/org/apache/lucene/search/vectorhighlight/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,5 +1,5 @@
>  /lucene/dev/branches/branch_3x/lucene/contrib/fast-vector-
> highlighter/src/java/org/apache/lucene/search/vectorhighlight:941394,94665
> 1,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036
>  /lucene/dev/trunk/lucene/contrib/fast-vector-
> highlighter/src/java/org/apache/lucene/search/vectorhighlight:929738,93239
> 8,935522,938989,939611,939649,940730,946599,948082,948429,949288,949976,94
> 9997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785
> ,990281,994979,999223,999842
>
> /lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/se
> arch/vectorhighlight:989035
> -/lucene/java/branches/lucene_3_0/contrib/fast-vector-
> highlighter/src/java/org/apache/lucene/search/vectorhighlight:889688,89121
> 1,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,95
> 0301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228
> ,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1
> 029022,1029024,1029039,1029077,1029138,1029374,1034054
> -/lucene/java/trunk/contrib/fast-vector-
> highlighter/src/java/org/apache/lucene/search/vectorhighlight:821888,83403
> 5,836155,881819,886257,887347,887532,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,9
> 19060,919869,920270
> +/lucene/java/branches/lucene_3_0/contrib/fast-vector-
> highlighter/src/java/org/apache/lucene/search/vectorhighlight:889688,89121
> 1,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,95
> 0301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228
> ,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1
> 029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk/contrib/fast-vector-
> highlighter/src/java/org/apache/lucene/search/vectorhighlight:821888,83403
> 5,836155,881819,886257,887347,887532,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,9
> 16543,919060,919869,920270
>
> Propchange: lucene/java/branches/lucene_2_9/contrib/fast-vector-
> highlighter/src/test/org/apache/lucene/search/vectorhighlight/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,5 +1,5 @@
>  /lucene/dev/branches/branch_3x/lucene/contrib/fast-vector-
> highlighter/src/test/org/apache/lucene/search/vectorhighlight:941394,94665
> 1,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036
>  /lucene/dev/trunk/lucene/contrib/fast-vector-
> highlighter/src/test/org/apache/lucene/search/vectorhighlight:929738,93239
> 8,935522,938989,939611,939649,940730,946599,948082,948429,949288,949976,94
> 9997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785
> ,990281,994979,999223,999842
>
> /lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/se
> arch/vectorhighlight:989035
> -/lucene/java/branches/lucene_3_0/contrib/fast-vector-
> highlighter/src/test/org/apache/lucene/search/vectorhighlight:889688,89121
> 1,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,95
> 0301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228
> ,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1
> 029022,1029024,1029039,1029077,1029138,1029374,1034054
> -/lucene/java/trunk/contrib/fast-vector-
> highlighter/src/test/org/apache/lucene/search/vectorhighlight:821888,83403
> 5,836155,881819,886257,887347,887532,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,9
> 19060,919869,920270
> +/lucene/java/branches/lucene_3_0/contrib/fast-vector-
> highlighter/src/test/org/apache/lucene/search/vectorhighlight:889688,89121
> 1,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,95
> 0301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228
> ,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1
> 029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk/contrib/fast-vector-
> highlighter/src/test/org/apache/lucene/search/vectorhighlight:821888,83403
> 5,836155,881819,886257,887347,887532,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,9
> 16543,919060,919869,920270
>
> Propchange: lucene/java/branches/lucene_2_9/contrib/highlighter/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/contrib/highlighter:957920,988629,99
> 0167,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/contrib/highlighter:930932,963372,965299,989785,9
> 90161,990281,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/contrib/highlighter:990293,995063,999228,
> 1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,10
> 29022,1029024,1029039,1029077,1029138,1029374,1034054
> -/lucene/java/trunk/contrib/highlighter:903368,916543,919869
> +/lucene/java/branches/lucene_3_0/contrib/highlighter:990293,995063,999228
> ,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1
> 029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk/contrib/highlighter:900030,903368,916543,919869
>
> Propchange: lucene/java/branches/lucene_2_9/contrib/highlighter/src/test/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test:941394,
> 946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034
> 036
>
> /lucene/dev/trunk/lucene/contrib/highlighter/src/test:929738,930932,932398
> ,935522,938989,939611,939649,940730,946599,948082,948429,949288,949976,949
> 997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,
> 990161,990281,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/contrib/highlighter/src/test:889688,89121
> 1,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,95
> 0474,950580,957495,963788,965105,984217,988638,990293,995063,999228,102873
> 9,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,
> 1029024,1029039,1029077,1029138,1029374,1034054
> -
> /lucene/java/trunk/contrib/highlighter/src/test:821888,834035,836155,88767
> 0,889431-
> 889432,889579,889866,890439,891205,891209,891377,899627,900196,903368,9084
> 77,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
> +/lucene/java/branches/lucene_3_0/contrib/highlighter/src/test:889688,8912
> 11,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,9
> 50474,950580,957495,963788,965105,984217,988638,990293,995063,999228,10287
> 39,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022
> ,1029024,1029039,1029077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk/contrib/highlighter/src/test:821888,834035,836155,8876
> 70,889431-
> 889432,889579,889866,890439,891205,891209,891377,899627,900030,900196,9033
> 68,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,9
> 20270
>
> Propchange:
> lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/l
> ucene/store/instantiated/TestIndicesEquals.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -3,5 +3,5 @@
>
> /lucene/java/branches/lucene_2_4/contrib/instantiated/src/test/org/apache/
> lucene/store/instantiated/TestIndicesEquals.java:748824
>
> /lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/
> lucene/store/instantiated/TestIndicesEquals.java:817269-818599
>
> /lucene/java/branches/lucene_2_9_back_compat_tests/contrib/instantiated/sr
> c/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:818601-
> 821336
> -
> /lucene/java/branches/lucene_3_0/contrib/instantiated/src/test/org/apache/
> lucene/store/instantiated/TestIndicesEquals.java:889463,889688,891211,8996
> 39,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,9
> 50474,950580,957495,963788,965105,984217,988638,990293,995063,999228,10287
> 39,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022
> ,1029024,1029039,1029077,1029138,1029374,1034054
> -
> /lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/i
> nstantiated/TestIndicesEquals.java:821888,834035,836155,881213,881315,8814
> 66,881819,882374,882672,882807,882888,882977,883074-
> 883075,883554,884870,886257,886911,887347,887532,887602,887670,888247,8894
> 31-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,9
> 19060,919869,920270
> +/lucene/java/branches/lucene_3_0/contrib/instantiated/src/test/org/apache
> /lucene/store/instantiated/TestIndicesEquals.java:889463,889688,891211,899
> 639,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,
> 950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028
> 739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,102902
> 2,1029024,1029039,1029077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/
> instantiated/TestIndicesEquals.java:821888,834035,836155,881213,881315,881
> 466,881819,882374,882672,882807,882888,882977,883074-
> 883075,883554,884870,886257,886911,887347,887532,887602,887670,888247,8894
> 31-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,9
> 16543,919060,919869,920270
>
> Propchange: lucene/java/branches/lucene_2_9/src/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/src:957490,957920,984210,988629,9901
> 67,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/src:930932,957707,963372,963781,965103,965299,984
> 187,989785,990161,990281,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/src:963788,965105,984217,988638,990293,99
> 5063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,102893
> 1,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054
> -/lucene/java/trunk/src:903368,916543,919869
> +/lucene/java/branches/lucene_3_0/src:963788,965105,984217,988638,990293,9
> 95063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,10289
> 31,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk/src:900030,903368,916543,919869
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/BaseCh
> arFilter.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -6,5 +6,5 @@
>
> /lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/analysis/BaseC
> harFilter.java:748824
>
> /lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/BaseC
> harFilter.java:817269-818599
>
> /lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luc
> ene/analysis/BaseCharFilter.java:818601-821336
> -
> /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/BaseC
> harFilter.java:1028915,1028920,1028931,1029013,1029022,1029024,1029039,102
> 9077,1029138,1029374,1034054
> -
> /lucene/java/trunk/src/java/org/apache/lucene/analysis/BaseCharFilter.java
> :881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-
> 883075,883554,884870,886257,886911,887347,887532,887602,887670,888247,8894
> 31-
> 889432,889579,889866,890439,890967,890988,891189,891205,891209,891363,8913
> 77,893093,894348,897672,899627,900196,903368,908477,908975,909360,909398,9
> 10034,910078,912407,915399,916543,919060,919869,920270,924483-925561
> +/lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/Base
> CharFilter.java:1028915,1028920,1028931,1029013,1029022,1029024,1029039,10
> 29077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk/src/java/org/apache/lucene/analysis/BaseCharFilter.jav
> a:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-
> 883075,883554,884870,886257,886911,887347,887532,887602,887670,888247,8894
> 31-
> 889432,889579,889866,890439,890967,890988,891189,891205,891209,891363,8913
> 77,893093,894348,897672,899627,900030,900196,903368,908477,908975,909360,9
> 09398,910034,910078,912407,915399,916543,919060,919869,920270,924483-
> 925561
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Length
> Filter.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (added)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -0,0 +1 @@
> +/lucene/java/trunk/src/java/org/apache/lucene/analysis/LengthFilter.java:
> 900030
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Letter
> Tokenizer.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (added)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -0,0 +1 @@
> +/lucene/java/trunk/src/java/org/apache/lucene/analysis/LetterTokenizer.ja
> va:900030
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/LowerC
> aseTokenizer.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (added)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -0,0 +1 @@
> +/lucene/java/trunk/src/java/org/apache/lucene/analysis/LowerCaseTokenizer
> .java:900030
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Tokeni
> zer.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/
> Tokenizer.java:941394,946651,948430,957490,957920,984210,988629,990167,990
> 286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.jav
> a:929738,930932,932398,935522,938989,939611,939649,940730,946599,948082,94
> 8429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103
> ,965299,984187,989785,990161,990281,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/Token
> izer.java:889688,891211,900212,908479,909401,912383,915404,940993,948090,9
> 48432,950033,950301,950474,950580,957495,963788,965105,984217,988638,99029
> 3,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,10
> 28931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054
> -
> /lucene/java/trunk/src/java/org/apache/lucene/analysis/Tokenizer.java:8218
> 88,834035,836155,887670,889579,889866,890439,891205,891377,899627,900196,9
> 03368,908477,908975,909398,910034,910078,912407,915399,916543,919060,91986
> 9,920270
> +/lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/Toke
> nizer.java:889688,891211,900212,908479,909401,912383,915404,940993,948090,
> 948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,9902
> 93,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1
> 028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,103
> 8096
> +/lucene/java/trunk/src/java/org/apache/lucene/analysis/Tokenizer.java:821
> 888,834035,836155,887670,889579,889866,890439,891205,891377,899627,900030,
> 900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,9190
> 60,919869,920270
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/standa
> rd/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (added)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -0,0 +1 @@
> +/lucene/java/trunk/src/java/org/apache/lucene/analysis/standard:900030
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/standa
> rd/StandardFilter.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,2 +0,0 @@
> -
> /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard/Stan
> dardFilter.java:1034017
> -
> /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/stand
> ard/StandardFilter.java:1034054
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/standa
> rd/StandardTokenizer.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,2 +0,0 @@
> -
> /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard/Stan
> dardTokenizer.java:1034017
> -
> /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/stand
> ard/StandardTokenizer.java:1034054
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/standa
> rd/StandardTokenizerImpl.jflex
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,2 +0,0 @@
> -
> /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard/Stan
> dardTokenizerImpl.jflex:1034017
> -
> /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/stand
> ard/StandardTokenizerImpl.jflex:1034054
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/tokena
> ttributes/TermAttributeImpl.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -4,5 +4,5 @@
>
> /lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/analysis/token
> attributes/TermAttributeImpl.java:748824
>
> /lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/token
> attributes/TermAttributeImpl.java:817269-818599
>
> /lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/luc
> ene/analysis/tokenattributes/TermAttributeImpl.java:818601-821336
> -
> /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/token
> attributes/TermAttributeImpl.java:963788,965105,984217,988638,990293,99506
> 3,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1
> 029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054
> -
> /lucene/java/trunk/src/java/org/apache/lucene/analysis/tokenattributes/Ter
> mAttributeImpl.java:881213,881315,881466,881819,882374,882672,882807,88288
> 8,882977,883074-
> 883075,883554,884870,886257,886911,887347,887532,887602,887670,888247,8894
> 31-
> 889432,889579,889866,890439,890967,890988,891189,891205,891209,891363,8913
> 77,893093,894348,897672,899627,900196,903368,908477,908975,909360,909398,9
> 10034,910078,912407,915399,916543,919060,919869,920270
> +/lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/toke
> nattributes/TermAttributeImpl.java:963788,965105,984217,988638,990293,9950
> 63,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,
> 1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk/src/java/org/apache/lucene/analysis/tokenattributes/Te
> rmAttributeImpl.java:881213,881315,881466,881819,882374,882672,882807,8828
> 88,882977,883074-
> 883075,883554,884870,886257,886911,887347,887532,887602,887670,888247,8894
> 31-
> 889432,889579,889866,890439,890967,890988,891189,891205,891209,891363,8913
> 77,893093,894348,897672,899627,900030,900196,903368,908477,908975,909360,9
> 09398,910034,910078,912407,915399,916543,919060,919869,920270
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTer
> mQueryWrapperFilter.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/Mu
> ltiTermQueryWrapperFilter.java:941394,946651,948430,957490,957920,984210,9
> 88629,990167,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryW
> rapperFilter.java:929738,930932,932398,935522,938989,939611,939649,940730,
> 946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,9633
> 72,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1
> 034017
> -
> /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/MultiTe
> rmQueryWrapperFilter.java:889688,891211,899639,900212,908479,909401,912383
> ,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965
> 105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,102
> 8873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,10291
> 38,1029374,1034054
> -
> /lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapper
> Filter.java:821888,834035,836155,881819,886257,887347,887532,887670,889431
> -
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,9
> 19060,919869,920270
> +/lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/MultiT
> ermQueryWrapperFilter.java:889688,891211,899639,900212,908479,909401,91238
> 3,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,96
> 5105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,10
> 28873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029
> 138,1029374,1034054,1038096
> +/lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrappe
> rFilter.java:821888,834035,836155,881819,886257,887347,887532,887670,88943
> 1-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,9
> 16543,919060,919869,920270
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/util/AttributeS
> ource.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,5 +1,5 @@
>
> /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/Attr
> ibuteSource.java:946651
>
> /lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/AttributeSource.j
> ava:929738,932398,935522,940730,946599,949976,949997,950613,951521,989785
>
> /lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/util/Attribute
> Source.java:748824
> -
> /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/Attribute
> Source.java:886275,889688,891211,899639,900212,908479,909401,912383,915404
> ,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984
> 217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,10
> 28915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029
> 374,1034054
> +/lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/Attribut
> eSource.java:886275,889688,891211,899639,900212,908479,909401,912383,91540
> 4,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,98
> 4217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1
> 028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,102
> 9374,1034054,1038096
>
> /lucene/java/trunk/src/java/org/apache/lucene/util/AttributeSource.java:82
> 1888,824125,826029,826385,830871,833095,833297,833886,834035,836155,881819
> ,882672,883554,884870,886257,887347,887532,887670,889579,889866,890439,891
> 189,891205,891363,894348,897672,908975,910034,910078,912407,916543,919060,
> 919869,920270
>
> Modified:
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/util/OpenBitSet
> .java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/src/java/org/
> apache/lucene/util/OpenBitSet.java?rev=1038098&r1=1038097&r2=1038098&view=
> diff
> ==========================================================================
> ====
> ---
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/util/OpenBitSet
> .java (original)
> +++
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/util/OpenBitSet
> .java Tue Nov 23 13:17:02 2010
> @@ -799,12 +799,16 @@ public class OpenBitSet extends DocIdSet
>
>
>    public int hashCode() {
> -      long h = 0x98761234;  // something non-zero for length==0
> -      for (int i = bits.length; --i>=0;) {
> +    // Start with a zero hash and use a mix that results in zero if the
> input is zero.
> +    // This effectively truncates trailing zeros without an explicit
> check.
> +    long h = 0;
> +    for (int i = bits.length; --i>=0;) {
>        h ^= bits[i];
>        h = (h << 1) | (h >>> 63); // rotate left
>      }
> -    return (int)((h>>32) ^ h);  // fold leftmost bits into right
> +    // fold leftmost bits into right and add a constant to prevent
> +    // empty sets from returning 0, which is too common.
> +    return (int)((h>>32) ^ h) + 0x98761234;
>    }
>
>  }
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/util/StringHelp
> er.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (added)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -0,0 +1 @@
> +/lucene/java/trunk/src/java/org/apache/lucene/util/StringHelper.java:9000
> 30
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/
> --------------------------------------------------------------------------
> ----
>     svn:mergeinfo =
> /lucene/java/trunk/src/test/org/apache/lucene/analysis:900030
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/BaseTo
> kenStreamTestCase.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,5 +1,5 @@
>
> /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/
> BaseTokenStreamTestCase.java:946651
>
> /lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/BaseTokenStre
> amTestCase.java:929738,932398,935522,940730,946599,949976,949997,950613,95
> 1521,989785
>
> /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/BaseT
> okenStreamTestCase.java:748824
> -
> /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/BaseT
> okenStreamTestCase.java:886275,889688,891211,899639,900212,908479,909401,9
> 12383,915404,940993,948090,948432,950033,950301,950474,950580,957495,96378
> 8,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,102882
> 7,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,
> 1029138,1029374,1034054
> +/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/Base
> TokenStreamTestCase.java:886275,889688,891211,899639,900212,908479,909401,
> 912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,9637
> 88,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,10288
> 27,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077
> ,1029138,1029374,1034054,1038096
>
> /lucene/java/trunk/src/test/org/apache/lucene/analysis/BaseTokenStreamTest
> Case.java:818920,821888,824125,826029,826385,830871,833095,833297,833886,8
> 34035,836155,881819,882672,883554,884870,887347,887532,887670,889579,88986
> 6,890439,891189,891205,891363,897672,908975,910034,910078,912407,916543,91
> 9060,919869,920270
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestIS
> OLatin1AccentFilter.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/
> TestISOLatin1AccentFilter.java:941394,946651,948430,957490,957920,984210,9
> 88629,990167,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1
> AccentFilter.java:929738,930932,932398,935522,938989,939611,939649,940730,
> 946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,9633
> 72,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1
> 034017
> -
> /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/TestI
> SOLatin1AccentFilter.java:889688,891211,899639,900212,908479,909401,912383
> ,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965
> 105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,102
> 8873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,10291
> 38,1029374,1034054
> -
> /lucene/java/trunk/src/test/org/apache/lucene/analysis/TestISOLatin1Accent
> Filter.java:821888,834035,836155,881819,886257,887347,887532,887670,889431
> -
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,9
> 19060,919869,920270
> +/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/Test
> ISOLatin1AccentFilter.java:889688,891211,899639,900212,908479,909401,91238
> 3,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,96
> 5105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,10
> 28873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029
> 138,1029374,1034054,1038096
> +/lucene/java/trunk/src/test/org/apache/lucene/analysis/TestISOLatin1Accen
> tFilter.java:821888,834035,836155,881819,886257,887347,887532,887670,88943
> 1-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,9
> 16543,919060,919869,920270
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDa
> teTools.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/
> TestDateTools.java:941394,946651,948430,957490,957920,984210,988629,990167
> ,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools
> .java:929738,930932,932398,935522,938989,939611,939649,940730,946599,94808
> 2,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,96
> 5103,965299,984187,989785,990161,990281,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestD
> ateTools.java:889688,891211,899639,900212,908479,909401,912383,915404,9409
> 93,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,9
> 88638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915
> ,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1
> 034054
> -
> /lucene/java/trunk/src/test/org/apache/lucene/document/TestDateTools.java:
> 821888,834035,836155,881819,886257,887347,887532,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,9
> 19060,919869,920270
> +/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/Test
> DateTools.java:889688,891211,899639,900212,908479,909401,912383,915404,940
> 993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,
> 988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,102891
> 5,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,
> 1034054,1038096
> +/lucene/java/trunk/src/test/org/apache/lucene/document/TestDateTools.java
> :821888,834035,836155,881819,886257,887347,887532,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,9
> 16543,919060,919869,920270
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNu
> mberTools.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/
> TestNumberTools.java:941394,946651,948430,957490,957920,984210,988629,9901
> 67,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberToo
> ls.java:929738,930932,932398,935522,938989,939611,939649,940730,946599,948
> 082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,
> 965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestN
> umberTools.java:889688,891211,899639,900212,908479,909401,912383,915404,94
> 0993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217
> ,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,10289
> 15,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374
> ,1034054
> -
> /lucene/java/trunk/src/test/org/apache/lucene/document/TestNumberTools.jav
> a:821888,834035,836155,881819,886257,887347,887532,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,9
> 19060,919869,920270
> +/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/Test
> NumberTools.java:889688,891211,899639,900212,908479,909401,912383,915404,9
> 40993,948090,948432,950033,950301,950474,950580,957495,963788,965105,98421
> 7,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028
> 915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,102937
> 4,1034054,1038096
> +/lucene/java/trunk/src/test/org/apache/lucene/document/TestNumberTools.ja
> va:821888,834035,836155,881819,886257,887347,887532,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,9
> 16543,919060,919869,920270
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index:941
> 394,946651,957490,957920,984210,988629,990167,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/src/test/org/apache/lucene/index:930932,940730,94
> 9288,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785
> ,990161,990281,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index:950301,9
> 50474,950580,957495,963788,965105,984217,988638,990293,995063,999228,10287
> 39,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022
> ,1029024,1029039,1029077,1029138,1029374,1034054
> -
> /lucene/java/trunk/src/test/org/apache/lucene/index:834035,836155,887670,8
> 89579,889866,890439,891205,891377,903368,916543,919869,920270
> +/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index:950301,
> 950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028
> 739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,102902
> 2,1029024,1029039,1029077,1029138,1029374,1034054,1038096
> +/lucene/java/trunk/src/test/org/apache/lucene/index:834035,836155,887670,
> 889579,889866,890439,891205,891377,900030,903368,916543,919869,920270
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackw
> ardsCompatibility.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/Tes
> tBackwardsCompatibility.java:941394,946651,948430,957490,957920,984210,988
> 629,990167,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCom
> patibility.java:929738,930932,932398,935522,938989,939611,939649,940730,94
> 6599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372
> ,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,103
> 4017
> -
> /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestBack
> wardsCompatibility.java:889688,891211,899639,900212,908479,909401,912383,9
> 15404,940993,948090,948432,950033,950301,950474,950580,957495,963788,96510
> 5,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,10288
> 73,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138
> ,1029374,1034054
> -
> /lucene/java/trunk/src/test/org/apache/lucene/index/TestBackwardsCompatibi
> lity.java:821888,834035,836155,881819,886257,887347,887532,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,9
> 19060,919869,920270
> +/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestBac
> kwardsCompatibility.java:889688,891211,899639,900212,908479,909401,912383,
> 915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,9651
> 05,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028
> 873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,102913
> 8,1029374,1034054,1038096
> +/lucene/java/trunk/src/test/org/apache/lucene/index/TestBackwardsCompatib
> ility.java:821888,834035,836155,881819,886257,887347,887532,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,9
> 16543,919060,919869,920270
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/TestCach
> ingWrapperFilter.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/Te
> stCachingWrapperFilter.java:957920,990167,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrap
> perFilter.java:930932,963372,965299,990161,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/TestCac
> hingWrapperFilter.java:999228,1028739,1028779,1028789,1028827,1028873,1028
> 915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,102937
> 4,1034054
> -
> /lucene/java/trunk/src/test/org/apache/lucene/search/TestCachingWrapperFil
> ter.java:903368,916543,919869
> +/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/TestCa
> chingWrapperFilter.java:999228,1028739,1028779,1028789,1028827,1028873,102
> 8915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,10293
> 74,1034054,1038096
> +/lucene/java/trunk/src/test/org/apache/lucene/search/TestCachingWrapperFi
> lter.java:900030,903368,916543,919869
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/spans/Te
> stPayloadSpans.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/sp
> ans/TestPayloadSpans.java:957920,990167,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPaylo
> adSpans.java:930932,963372,965299,990161,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/spans/T
> estPayloadSpans.java:999228,1028739,1028779,1028789,1028827,1028873,102891
> 5,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,
> 1034054
> -
> /lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpan
> s.java:903368,916543,919869
> +/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/spans/
> TestPayloadSpans.java:999228,1028739,1028779,1028789,1028827,1028873,10289
> 15,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374
> ,1034054,1038096
> +/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpa
> ns.java:900030,903368,916543,919869
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/spans/Te
> stSpans.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/sp
> ans/TestSpans.java:957920,990167,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans
> .java:930932,963372,965299,990161,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/spans/T
> estSpans.java:999228,1028739,1028779,1028789,1028827,1028873,1028915,10289
> 20,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054
> -
> /lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java:
> 903368,916543,919869
> +/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/spans/
> TestSpans.java:999228,1028739,1028779,1028789,1028827,1028873,1028915,1028
> 920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,103405
> 4,1038096
> +/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java
> :900030,903368,916543,919869
>
> Propchange:
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttrib
> uteSource.java
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Nov 23 13:17:02 2010
> @@ -1,4 +1,4 @@
>
> /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/Test
> AttributeSource.java:941394,946651,948430,957490,957920,984210,988629,9901
> 67,990286,999226,999847,1034036
>
> /lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSour
> ce.java:929738,930932,932398,935522,938989,939611,939649,940730,946599,948
> 082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,
> 965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017
> -
> /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/util/TestAttri
> buteSource.java:889688,891211,899639,900212,908479,909401,912383,915404,94
> 0993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217
> ,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,10289
> 15,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374
> ,1034054
> -
> /lucene/java/trunk/src/test/org/apache/lucene/util/TestAttributeSource.jav
> a:821888,834035,836155,881819,886257,887347,887532,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,9
> 19060,919869,920270
> +/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/util/TestAttr
> ibuteSource.java:889688,891211,899639,900212,908479,909401,912383,915404,9
> 40993,948090,948432,950033,950301,950474,950580,957495,963788,965105,98421
> 7,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028
> 915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,102937
> 4,1034054,1038096
> +/lucene/java/trunk/src/test/org/apache/lucene/util/TestAttributeSource.ja
> va:821888,834035,836155,881819,886257,887347,887532,887670,889431-
> 889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,8996
> 27,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,9
> 16543,919060,919869,920270
>
> Modified:
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestOpenBi
> tSet.java
> URL:
> http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/src/test/org/
> apache/lucene/util/TestOpenBitSet.java?rev=1038098&r1=1038097&r2=1038098&v
> iew=diff
> ==========================================================================
> ====
> ---
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestOpenBi
> tSet.java (original)
> +++
> lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestOpenBi
> tSet.java Tue Nov 23 13:17:02 2010
> @@ -233,7 +233,14 @@ public class TestOpenBitSet extends Luce
>      }
>    }
>
> -
> +  public void testHashCodeEquals() {
> +    OpenBitSet bs1 = new OpenBitSet(200);
> +    OpenBitSet bs2 = new OpenBitSet(64);
> +    bs1.set(3);
> +    bs2.set(3);
> +    assertEquals(bs1, bs2);
> +    assertEquals(bs1.hashCode(), bs2.hashCode());
> +  }
>  }
>
>
>

Mime
View raw message