Github user kinow commented on the issue: https://github.com/apache/lucene-solr/pull/268 Sure @iorixxx Let's see if I didn't miss anything. So first I found the *TokenizerImpl.java files with `git diff --name-only HEAD~1 | grep TokenizerImpl` ``` lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java ``` Then use the file from GitHub master branch. ``` git diff --name-only HEAD~1 | grep TokenizerImpl | xargs -I{} git checkout origin/master {} git add . git commit -m "Will be rebased..." git rebase -i HEAD~2 # mark with f the "Will be rebased commit" ``` And now `git diff --name-only HEAD~1 | grep TokenizerImpl` gives me an empty result. Confirm I have the jflex files: ``` $git diff --name-only origin/fix-spell-check | xargs -I{} basename {} .java | xargs -I{} find . -name "{}*" ./lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex ./lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java ./lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java ./lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex ./lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex ./lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java ./lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex ./lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java ``` Then get the diff (`git diff --patch origin/fix-spell-check `).... and trying to apply the Java changes to jflex files now... except that... there's no "**occured**" on these jflex files... After a bit of searching here and there, and reading a bit about jflex (had never heard about it, good to learn something new), looks like the typo is actually in jflex's code. https://github.com/jflex-de/jflex/pull/218 Going to push-force the commit that removes the *TokenizerImpl.java files. Does it make sense? Did I miss something? Cheers Bruno
--- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org