You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lucenenet.apache.org by hakeemsm <gi...@git.apache.org> on 2015/01/21 03:51:15 UTC
[GitHub] lucenenet pull request: Expressions & other contrib projects
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 <ha...@gmail.com>
Date: 2015-01-05T00:16:49Z
Expressions halfway thru
commit a17473bf1ddcef3acd9217ded6479958749260d3
Author: Hakeem S Mohammad <ha...@gmail.com>
Date: 2015-01-05T00:19:07Z
expressions project & tests
commit 41b9abda9a4ac8079a3d6f14643f55fd173d8f0c
Author: Laimonas Simutis <la...@gmail.com>
Date: 2015-01-03T02:46:47Z
use set equality check
commit 9fb8a93b7e6f996d091d2cf68f1af628a5e23407
Author: Itamar Syn-Hershko <it...@code972.com>
Date: 2015-01-03T19:14:55Z
Adding helper method for easier porting of tests
commit ba9c035ecbfa8d8a964705c3a01cb06fbc7464c5
Author: Itamar Syn-Hershko <it...@code972.com>
Date: 2015-01-04T12:53:42Z
Finish porting CommonGrams support
commit c026905e2bdc1fb50961500b50da1380c9bcc5d5
Author: Hakeem <ha...@gmail.com>
Date: 2015-01-08T23:48:20Z
expressions changes
commit 0a8ebb4f03d88a56c779e2e9d6d7816c1e931e98
Author: Hakeem S Mohammad <ha...@gmail.com>
Date: 2015-01-14T03:43:40Z
Tests & compiler updated
commit 736bb1944b1294636e3f30aa60654b7bbf10ccc8
Author: Hakeem S Mohammad <ha...@gmail.com>
Date: 2015-01-18T14:25:23Z
first cut of expressions
commit bba3c5577ad2c0c22a23f8a1b91f50ca60365334
Author: Hakeem S Mohammad <ha...@gmail.com>
Date: 2015-01-19T03:37:35Z
TestDemo expressions pass except for some antlr issues
commit ce052f96e0a7a1105bcbc30f7411d2cb4e7f5755
Author: Hakeem S Mohammad <ha...@gmail.com>
Date: 2015-01-20T04:21:38Z
most of expression tests work + highlighter, query, queryparser & tests. they dont compile yet
commit 84049a69b972e9d684d1f73aa23347998f00495d
Author: Hakeem <ha...@gmail.com>
Date: 2015-01-20T23:45:29Z
groupings added, some expression tests working
commit 577fd72847407b0aa230593350575c91e2648001
Author: Hakeem S Mohammad <ha...@gmail.com>
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
Re: [GitHub] lucenenet pull request: Expressions & other contrib projects
Posted by Hakeem Mohammed <ha...@gmail.com>.
OK, having issues with rebase\mege. will try to do it tomorrow
On Wed, Jan 21, 2015 at 9:49 AM, synhershko <gi...@git.apache.org> wrote:
> Github user synhershko commented on the pull request:
>
> https://github.com/apache/lucenenet/pull/53#issuecomment-70849686
>
> Thanks for this PR
>
> Can you please resend this PR, this time with only the Expressions
> bits (code + tests), and also rebase this against the current master so
> there are no merge conflicts?
>
> It will be probably easier for you to create a new branch following
> apache/master and copying just the Expression projects files over,
> committing and pushing that
>
>
> ---
> 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 infrastructure@apache.org or file a JIRA ticket
> with INFRA.
> ---
>
[GitHub] lucenenet pull request: Expressions & other contrib projects
Posted by synhershko <gi...@git.apache.org>.
Github user synhershko commented on the pull request:
https://github.com/apache/lucenenet/pull/53#issuecomment-70849686
Thanks for this PR
Can you please resend this PR, this time with only the Expressions bits (code + tests), and also rebase this against the current master so there are no merge conflicts?
It will be probably easier for you to create a new branch following apache/master and copying just the Expression projects files over, committing and pushing that
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
Re: [GitHub] lucenenet pull request: Expressions & other contrib projects
Posted by Hakeem Mohammed <ha...@gmail.com>.
Hey, looks like there were some merge conflicts, sorry about that
On Tue, Jan 20, 2015 at 9:51 PM, hakeemsm <gi...@git.apache.org> 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 <ha...@gmail.com>
> Date: 2015-01-05T00:16:49Z
>
> Expressions halfway thru
>
> commit a17473bf1ddcef3acd9217ded6479958749260d3
> Author: Hakeem S Mohammad <ha...@gmail.com>
> Date: 2015-01-05T00:19:07Z
>
> expressions project & tests
>
> commit 41b9abda9a4ac8079a3d6f14643f55fd173d8f0c
> Author: Laimonas Simutis <la...@gmail.com>
> Date: 2015-01-03T02:46:47Z
>
> use set equality check
>
> commit 9fb8a93b7e6f996d091d2cf68f1af628a5e23407
> Author: Itamar Syn-Hershko <it...@code972.com>
> Date: 2015-01-03T19:14:55Z
>
> Adding helper method for easier porting of tests
>
> commit ba9c035ecbfa8d8a964705c3a01cb06fbc7464c5
> Author: Itamar Syn-Hershko <it...@code972.com>
> Date: 2015-01-04T12:53:42Z
>
> Finish porting CommonGrams support
>
> commit c026905e2bdc1fb50961500b50da1380c9bcc5d5
> Author: Hakeem <ha...@gmail.com>
> Date: 2015-01-08T23:48:20Z
>
> expressions changes
>
> commit 0a8ebb4f03d88a56c779e2e9d6d7816c1e931e98
> Author: Hakeem S Mohammad <ha...@gmail.com>
> Date: 2015-01-14T03:43:40Z
>
> Tests & compiler updated
>
> commit 736bb1944b1294636e3f30aa60654b7bbf10ccc8
> Author: Hakeem S Mohammad <ha...@gmail.com>
> Date: 2015-01-18T14:25:23Z
>
> first cut of expressions
>
> commit bba3c5577ad2c0c22a23f8a1b91f50ca60365334
> Author: Hakeem S Mohammad <ha...@gmail.com>
> Date: 2015-01-19T03:37:35Z
>
> TestDemo expressions pass except for some antlr issues
>
> commit ce052f96e0a7a1105bcbc30f7411d2cb4e7f5755
> Author: Hakeem S Mohammad <ha...@gmail.com>
> Date: 2015-01-20T04:21:38Z
>
> most of expression tests work + highlighter, query, queryparser &
> tests. they dont compile yet
>
> commit 84049a69b972e9d684d1f73aa23347998f00495d
> Author: Hakeem <ha...@gmail.com>
> Date: 2015-01-20T23:45:29Z
>
> groupings added, some expression tests working
>
> commit 577fd72847407b0aa230593350575c91e2648001
> Author: Hakeem S Mohammad <ha...@gmail.com>
> 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 infrastructure@apache.org or file a JIRA ticket
> with INFRA.
> ---
>
Re: [GitHub] lucenenet pull request: Expressions & other contrib projects
Posted by Itamar Syn-Hershko <it...@code972.com>.
You cannot "exclude commits". Like I said, you need to squash on your local
branch, this will merge commits together, and then push -f.
http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
--
Itamar Syn-Hershko
http://code972.com | @synhershko <https://twitter.com/synhershko>
Freelance Developer & Consultant
Lucene.NET committer and PMC member
On Sat, Jan 24, 2015 at 5:46 AM, Hakeem Mohammed <ha...@gmail.com>
wrote:
> Hey, I dont see an option to exclude previous commits when creating a PR.
> is there a hidden feature somewhere? Thanks
>
> On Fri, Jan 23, 2015 at 10:39 PM, hakeemsm <gi...@git.apache.org> wrote:
>
> > Github user hakeemsm closed the pull request at:
> >
> > https://github.com/apache/lucenenet/pull/53
> >
> >
> > ---
> > 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 infrastructure@apache.org or file a JIRA
> ticket
> > with INFRA.
> > ---
> >
>
Re: [GitHub] lucenenet pull request: Expressions & other contrib projects
Posted by Hakeem Mohammed <ha...@gmail.com>.
Hey, I dont see an option to exclude previous commits when creating a PR.
is there a hidden feature somewhere? Thanks
On Fri, Jan 23, 2015 at 10:39 PM, hakeemsm <gi...@git.apache.org> wrote:
> Github user hakeemsm closed the pull request at:
>
> https://github.com/apache/lucenenet/pull/53
>
>
> ---
> 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 infrastructure@apache.org or file a JIRA ticket
> with INFRA.
> ---
>
[GitHub] lucenenet pull request: Expressions & other contrib projects
Posted by hakeemsm <gi...@git.apache.org>.
Github user hakeemsm closed the pull request at:
https://github.com/apache/lucenenet/pull/53
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---