You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2010/05/04 18:37:45 UTC
svn commit: r940941 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/ lucene/backwards/src/java/org/apache/lucene/search/
lucene/backwards/src/test/org/apache/lucene/analysis/
lucene/backwards/src/test/org/apache/lucene/document/ lu...
Author: uschindler
Date: Tue May 4 16:37:44 2010
New Revision: 940941
URL: http://svn.apache.org/viewvc?rev=940941&view=rev
Log:
add missing merge props for the property addition before
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
lucene/dev/branches/branch_3x/lucene/build.xml (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar (props changed)
lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.5.5.jar (props changed)
lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/ (props changed)
lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template (props changed)
lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template (props changed)
lucene/dev/branches/branch_3x/solr/src/solrj/org/ (props changed)
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/ (props changed)
lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/ (props changed)
Propchange: lucene/dev/branches/branch_3x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1 +1 @@
-/lucene/dev/trunk:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
Propchange: lucene/dev/branches/branch_3x/lucene/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk:932749
-/lucene/dev/trunk/lucene:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458:924791,924850
/lucene/java/branches/lucene_2_4:748824
/lucene/java/branches/lucene_2_9:817269-818600,825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/CHANGES.txt:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/CHANGES.txt:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/CHANGES.txt:924791,924850
/lucene/java/branches/lucene_2_9/CHANGES.txt:896850,909334
/lucene/java/trunk/CHANGES.txt:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,3 +1,3 @@
-/lucene/dev/trunk/lucene/backwards/src:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/backwards/src:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/backwards/src:924850
/lucene/java/trunk/backwards/src:924781
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924791,924850
/lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:748824
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:817269-818600,825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:924791,924850
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestDateTools.java:924791,924850
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:924791,924850
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:924791,924850
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/util/TestAttributeSource.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:817269-818600,825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/build.xml:932749
-/lucene/dev/trunk/lucene/build.xml:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/build.xml:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/build.xml:924791,924850
/lucene/java/branches/lucene_2_9/build.xml:896850,909334
/lucene/java/trunk/build.xml:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/contrib:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/contrib:924791,924850
/lucene/java/branches/lucene_2_4/contrib:748824
/lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/CHANGES.txt:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/contrib/CHANGES.txt:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/contrib/CHANGES.txt:924791,924850
/lucene/java/branches/lucene_2_4/contrib/CHANGES.txt:748824
/lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/highlighter/src/test:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/contrib/highlighter/src/test:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/contrib/highlighter/src/test:924791,924850
/lucene/java/branches/lucene_2_4/contrib/highlighter/src/test:748824
/lucene/java/branches/lucene_2_9/contrib/highlighter/src/test:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924791,924850
/lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:896850,909334
/lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Tokenizer.java:924791,924850
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Tokenizer.java:896850,909334
/lucene/java/trunk/src/java/org/apache/lucene/analysis/Tokenizer.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924791,924850
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:896850,909334
/lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:924791,924850
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestDateTools.java:924791,924850
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestNumberTools.java:924791,924850
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:924791,924850
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:896850,909334
/lucene/java/trunk/src/test/org/apache/lucene/util/TestAttributeSource.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/solr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/solr:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/solr:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/java/branches/lucene_2_4/solr:748824
/lucene/java/branches/lucene_2_9/solr:817269-818600,825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/solr:818601-821336
Propchange: lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/lib/commons-httpclient-3.1.jar:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/solr/lib/commons-httpclient-3.1.jar:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/solr/trunk/lib/commons-httpclient-3.1.jar:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.5.5.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.5.5.jar:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.5.5.jar:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/solr/trunk/lib/jcl-over-slf4j-1.5.5.jar:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/common/org/apache/solr/common:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/solr/src/common/org/apache/solr/common:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/solr/trunk/src/common/org/apache/solr/common:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/solr/trunk/src/maven/solr-core-pom.xml.template:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/solr/trunk/src/maven/solr-solrj-pom.xml.template:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/solrj/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/solrj/org:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/solr/src/solrj/org:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/solr/trunk/src/solrj/org:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/test/org/apache/solr/client:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/solr/src/test/org/apache/solr/client:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/solr/trunk/src/test/org/apache/solr/client:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 4 16:37:44 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
+/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:931337,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,935521,935734,935739,935771,936522,936544,937360,940451-940452,940878-940892
/lucene/solr/trunk/src/webapp/src/org/apache/solr/client/solrj/embedded:922950-923910,923912-925091