Im trying to apply this via the command line "patch -p0 < SOLR-1316.patch".
When patching against trunk I get the following errors. ~/workspace $ patch -p0 < SOLR-1316.patch patching file dev/trunk/solr/src/java/org/apache/solr/handler/component/SpellCheckComponent.java Hunk #2 succeeded at 575 (offset -3 lines). patching file dev/trunk/solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/SolrSpellChecker.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/BufferingTermFreqIteratorWrapper.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/FileDictionary.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/Lookup.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/SortedTermFreqIteratorWrapper.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/Suggester.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/UnsortedTermFreqIteratorWrapper.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookup.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellTernarySearchTrie.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/tst/TSTAutocomplete.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/tst/TSTLookup.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/tst/TernaryTreeNode.java patching file dev/trunk/solr/src/java/org/apache/solr/util/HighFrequencyDictionary.java Hunk #1 FAILED at 54. Hunk #2 FAILED at 69. 2 out of 2 hunks FAILED -- saving rejects to file dev/trunk/solr/src/java/org/apache/solr/util/HighFrequencyDictionary.java.rej patching file dev/trunk/solr/src/java/org/apache/solr/util/SortedIterator.java patching file dev/trunk/solr/src/java/org/apache/solr/util/TermFreqIterator.java patching file dev/trunk/solr/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java patching file dev/trunk/solr/src/test/test-files/solr/conf/schema-spellchecker.xml patching file dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml Patching against the 1.4.0 tag I get the following errors $ patch -p0 < SOLR-1316.patch patching file dev/trunk/solr/src/java/org/apache/solr/handler/component/SpellCheckComponent.java Hunk #1 succeeded at 102 (offset -5 lines). Hunk #2 succeeded at 348 (offset -230 lines). patching file dev/trunk/solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java Hunk #1 succeeded at 40 (offset 1 line). patching file dev/trunk/solr/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java Hunk #1 succeeded at 105 (offset 3 lines). patching file dev/trunk/solr/src/java/org/apache/solr/spelling/SolrSpellChecker.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/BufferingTermFreqIteratorWrapper.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/FileDictionary.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/Lookup.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/SortedTermFreqIteratorWrapper.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/Suggester.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/UnsortedTermFreqIteratorWrapper.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookup.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellTernarySearchTrie.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/tst/TSTAutocomplete.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/tst/TSTLookup.java patching file dev/trunk/solr/src/java/org/apache/solr/spelling/suggest/tst/TernaryTreeNode.java patching file dev/trunk/solr/src/java/org/apache/solr/util/HighFrequencyDictionary.java patching file dev/trunk/solr/src/java/org/apache/solr/util/SortedIterator.java patching file dev/trunk/solr/src/java/org/apache/solr/util/TermFreqIterator.java patching file dev/trunk/solr/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java patching file dev/trunk/solr/src/test/test-files/solr/conf/schema-spellchecker.xml patching file dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml Hunk #1 succeeded at 86 with fuzz 1 (offset -6 lines). As you can see both versions don't appear to be working. I tried building each but neither would compile. Which version/tag should be used when applying this patch? Thanks -- View this message in context: http://lucene.472066.n3.nabble.com/how-to-apply-patch-SOLR-1316-tp676497p901887.html Sent from the Solr - User mailing list archive at Nabble.com.
