Hey, looks like there were some merge conflicts, sorry about that On Tue, Jan 20, 2015 at 9:51 PM, hakeemsm <[email protected]> wrote:
> GitHub user hakeemsm opened a pull request: > > https://github.com/apache/lucenenet/pull/53 > > Expressions & other contrib projects > > Expressions compiles & some tests pass. The others fail due to Antlr > issues. > Contrib projects don't even compile and are not added to the sln > > You can merge this pull request into a Git repository by running: > > $ git pull https://github.com/hakeemsm/lucene.net master > > Alternatively you can review and apply these changes as the patch at: > > https://github.com/apache/lucenenet/pull/53.patch > > To close this pull request, make a commit to your master/trunk branch > with (at least) the following in the commit message: > > This closes #53 > > ---- > commit 09232290df361e444c41027488e6e6e2298ee83e > Author: Hakeem S Mohammad <[email protected]> > Date: 2015-01-05T00:16:49Z > > Expressions halfway thru > > commit a17473bf1ddcef3acd9217ded6479958749260d3 > Author: Hakeem S Mohammad <[email protected]> > Date: 2015-01-05T00:19:07Z > > expressions project & tests > > commit 41b9abda9a4ac8079a3d6f14643f55fd173d8f0c > Author: Laimonas Simutis <[email protected]> > Date: 2015-01-03T02:46:47Z > > use set equality check > > commit 9fb8a93b7e6f996d091d2cf68f1af628a5e23407 > Author: Itamar Syn-Hershko <[email protected]> > Date: 2015-01-03T19:14:55Z > > Adding helper method for easier porting of tests > > commit ba9c035ecbfa8d8a964705c3a01cb06fbc7464c5 > Author: Itamar Syn-Hershko <[email protected]> > Date: 2015-01-04T12:53:42Z > > Finish porting CommonGrams support > > commit c026905e2bdc1fb50961500b50da1380c9bcc5d5 > Author: Hakeem <[email protected]> > Date: 2015-01-08T23:48:20Z > > expressions changes > > commit 0a8ebb4f03d88a56c779e2e9d6d7816c1e931e98 > Author: Hakeem S Mohammad <[email protected]> > Date: 2015-01-14T03:43:40Z > > Tests & compiler updated > > commit 736bb1944b1294636e3f30aa60654b7bbf10ccc8 > Author: Hakeem S Mohammad <[email protected]> > Date: 2015-01-18T14:25:23Z > > first cut of expressions > > commit bba3c5577ad2c0c22a23f8a1b91f50ca60365334 > Author: Hakeem S Mohammad <[email protected]> > Date: 2015-01-19T03:37:35Z > > TestDemo expressions pass except for some antlr issues > > commit ce052f96e0a7a1105bcbc30f7411d2cb4e7f5755 > Author: Hakeem S Mohammad <[email protected]> > Date: 2015-01-20T04:21:38Z > > most of expression tests work + highlighter, query, queryparser & > tests. they dont compile yet > > commit 84049a69b972e9d684d1f73aa23347998f00495d > Author: Hakeem <[email protected]> > Date: 2015-01-20T23:45:29Z > > groupings added, some expression tests working > > commit 577fd72847407b0aa230593350575c91e2648001 > Author: Hakeem S Mohammad <[email protected]> > Date: 2015-01-21T02:47:51Z > > some more passing expression tests > > ---- > > > --- > If your project is set up for it, you can reply to this email and have your > reply appear on GitHub as well. If your project does not have this feature > enabled and wishes so, or if the feature is enabled but not working, please > contact infrastructure at [email protected] or file a JIRA ticket > with INFRA. > --- >
