You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@vxquery.apache.org by Till Westmann <ti...@apache.org> on 2015/06/28 01:10:15 UTC
GitHub workflow
Hi,
I’ve started to work on https://issues.apache.org/jira/browse/VXQUERY-159 <https://issues.apache.org/jira/browse/VXQUERY-159> and I’d like to use this to understand out GitHub workflow (and potentially add it to the website).
Could you tell me how you are using this so far (who branches what from where, where and how the review happens, and how the changes get merged back into the ASF repository)?
Thanks,
Till
Re: GitHub workflow
Posted by Steven Jacobs <sj...@ucr.edu>.
First question: I just add her git hub as a remote and then I can run her
branch locally if need be.
Second question: In Efi's case, since she isn't a commiter, I would merge
and push to master from the copy I pulled locally. In the case of a
commiter, they could push themselves when approved.
Steven
On Saturday, June 27, 2015, Till Westmann <ti...@apache.org> wrote:
> Thanks, Steven.
>
> A few questions on details :)
>
> > On Jun 27, 2015, at 5:47 PM, Steven Jacobs <sjaco002@ucr.edu
> <javascript:;>> wrote:
> >
> > We are still experimenting with it but Preston and I are doing a code
> > review for Efi this week. This is the process as we have it now:
> > 1. Efi created a fork of master on her Github
> > 2. She creates a pull request (Efi we forgot this step can you create the
> > request on this one?)
> > 3. We use the pull request interface on Github to add comments to the
> code.
>
> When you do this, can you/do you also get the whole branch for the PR to
> be able to test it locally?
>
> > 4. Once the code is accepted it can be pushed to master
>
> How does that work? Do you (Steven) get the branch for the pull request,
> rebase it on the current master (if necessary), and push it back to the ASF
> repo manually? Or is there a better way to move it from GitHub to the ASF
> repo?
>
> I would like to put step-by-step instructions with paste-able command on
> the website.
> It was really helpful for me that Preston did those for the XQTS tests -
> and I think that other people might appreciate them as well :)
>
> Cheers,
> Till
>
> > On Saturday, June 27, 2015, Till Westmann <tillw@apache.org
> <javascript:;>> wrote:
> >
> >> Hi,
> >>
> >> I’ve started to work on
> https://issues.apache.org/jira/browse/VXQUERY-159
> >> <https://issues.apache.org/jira/browse/VXQUERY-159> and I’d like to use
> >> this to understand out GitHub workflow (and potentially add it to the
> >> website).
> >> Could you tell me how you are using this so far (who branches what from
> >> where, where and how the review happens, and how the changes get merged
> >> back into the ASF repository)?
> >>
> >> Thanks,
> >> Till
>
>
Re: GitHub workflow
Posted by Till Westmann <ti...@apache.org>.
Thanks, Steven.
A few questions on details :)
> On Jun 27, 2015, at 5:47 PM, Steven Jacobs <sj...@ucr.edu> wrote:
>
> We are still experimenting with it but Preston and I are doing a code
> review for Efi this week. This is the process as we have it now:
> 1. Efi created a fork of master on her Github
> 2. She creates a pull request (Efi we forgot this step can you create the
> request on this one?)
> 3. We use the pull request interface on Github to add comments to the code.
When you do this, can you/do you also get the whole branch for the PR to be able to test it locally?
> 4. Once the code is accepted it can be pushed to master
How does that work? Do you (Steven) get the branch for the pull request, rebase it on the current master (if necessary), and push it back to the ASF repo manually? Or is there a better way to move it from GitHub to the ASF repo?
I would like to put step-by-step instructions with paste-able command on the website.
It was really helpful for me that Preston did those for the XQTS tests - and I think that other people might appreciate them as well :)
Cheers,
Till
> On Saturday, June 27, 2015, Till Westmann <ti...@apache.org> wrote:
>
>> Hi,
>>
>> I’ve started to work on https://issues.apache.org/jira/browse/VXQUERY-159
>> <https://issues.apache.org/jira/browse/VXQUERY-159> and I’d like to use
>> this to understand out GitHub workflow (and potentially add it to the
>> website).
>> Could you tell me how you are using this so far (who branches what from
>> where, where and how the review happens, and how the changes get merged
>> back into the ASF repository)?
>>
>> Thanks,
>> Till
Re: GitHub workflow
Posted by Steven Jacobs <sj...@ucr.edu>.
We are still experimenting with it but Preston and I are doing a code
review for Efi this week. This is the process as we have it now:
1. Efi created a fork of master on her Github
2. She creates a pull request (Efi we forgot this step can you create the
request on this one?)
3. We use the pull request interface on Github to add comments to the code.
4. Once the code is accepted it can be pushed to master
Steven
On Saturday, June 27, 2015, Till Westmann <ti...@apache.org> wrote:
> Hi,
>
> I’ve started to work on https://issues.apache.org/jira/browse/VXQUERY-159
> <https://issues.apache.org/jira/browse/VXQUERY-159> and I’d like to use
> this to understand out GitHub workflow (and potentially add it to the
> website).
> Could you tell me how you are using this so far (who branches what from
> where, where and how the review happens, and how the changes get merged
> back into the ASF repository)?
>
> Thanks,
> Till
Re: GitHub workflow
Posted by Eldon Carman <ec...@ucr.edu>.
I updated the review documentation on github. Take a look and give me one
more round of feedback before committing it to master.
https://github.com/apache/vxquery/pull/21
On Wed, Jul 8, 2015 at 3:51 PM, Steven Jacobs <sj...@ucr.edu> wrote:
> I looked at your pull request, I just had one comment: In the case where
> the author is a committer, shouldn't the author be the one who actually
> pushes to master? Or are we only doing code reviews for non-committers at
> this point?
>
> Also, for anyone interested, Efi's pull request can be seen here:
> https://github.com/apache/vxquery/pull/16
>
> These are the changes to enable collection and doc to allow HDFS
> directories. I have already done my first pass review, and Preston is going
> to review it as well.
>
> Steven
>
> On Mon, Jun 29, 2015 at 6:07 PM, Eldon Carman <ec...@ucr.edu> wrote:
>
> > I started creating a website site page to outline the process. I created
> a
> > github pull request for reviewing the site changes.
> >
> > https://github.com/apache/vxquery/pull/18
> >
> > On Sun, Jun 28, 2015 at 6:18 PM, Eldon Carman <ec...@ucr.edu> wrote:
> >
> > > This process should be written up on our website.
> > >
> > > Things to note and could be added to this documentation:
> > > - The pull request should compare against the Apache VXQuery master
> > > branch.
> > > - The code must pass the VXQuery test suite and the previously passing
> > > XQTS tests. (We have pages to document these procedures.)
> > > - If the code improves the XQTS test suite performance, we can update
> > our
> > > local list of passing tests. (Also on our website.)
> > >
> > > On Sun, Jun 28, 2015 at 2:05 AM, Efi Kaltirimidou <ef...@gmail.com>
> > > wrote:
> > >
> > >> Yes I will do a pull request today after I make sure all the edited
> and
> > >> new
> > >> file has the correct format.
> > >>
> > >> Efi
> > >> On Jun 28, 2015 2:10 AM, "Till Westmann" <ti...@apache.org> wrote:
> > >>
> > >> > Hi,
> > >> >
> > >> > I’ve started to work on
> > >> https://issues.apache.org/jira/browse/VXQUERY-159
> > >> > <https://issues.apache.org/jira/browse/VXQUERY-159> and I’d like to
> > use
> > >> > this to understand out GitHub workflow (and potentially add it to
> the
> > >> > website).
> > >> > Could you tell me how you are using this so far (who branches what
> > from
> > >> > where, where and how the review happens, and how the changes get
> > merged
> > >> > back into the ASF repository)?
> > >> >
> > >> > Thanks,
> > >> > Till
> > >>
> > >
> > >
> >
>
Re: GitHub workflow
Posted by Steven Jacobs <sj...@ucr.edu>.
I looked at your pull request, I just had one comment: In the case where
the author is a committer, shouldn't the author be the one who actually
pushes to master? Or are we only doing code reviews for non-committers at
this point?
Also, for anyone interested, Efi's pull request can be seen here:
https://github.com/apache/vxquery/pull/16
These are the changes to enable collection and doc to allow HDFS
directories. I have already done my first pass review, and Preston is going
to review it as well.
Steven
On Mon, Jun 29, 2015 at 6:07 PM, Eldon Carman <ec...@ucr.edu> wrote:
> I started creating a website site page to outline the process. I created a
> github pull request for reviewing the site changes.
>
> https://github.com/apache/vxquery/pull/18
>
> On Sun, Jun 28, 2015 at 6:18 PM, Eldon Carman <ec...@ucr.edu> wrote:
>
> > This process should be written up on our website.
> >
> > Things to note and could be added to this documentation:
> > - The pull request should compare against the Apache VXQuery master
> > branch.
> > - The code must pass the VXQuery test suite and the previously passing
> > XQTS tests. (We have pages to document these procedures.)
> > - If the code improves the XQTS test suite performance, we can update
> our
> > local list of passing tests. (Also on our website.)
> >
> > On Sun, Jun 28, 2015 at 2:05 AM, Efi Kaltirimidou <ef...@gmail.com>
> > wrote:
> >
> >> Yes I will do a pull request today after I make sure all the edited and
> >> new
> >> file has the correct format.
> >>
> >> Efi
> >> On Jun 28, 2015 2:10 AM, "Till Westmann" <ti...@apache.org> wrote:
> >>
> >> > Hi,
> >> >
> >> > I’ve started to work on
> >> https://issues.apache.org/jira/browse/VXQUERY-159
> >> > <https://issues.apache.org/jira/browse/VXQUERY-159> and I’d like to
> use
> >> > this to understand out GitHub workflow (and potentially add it to the
> >> > website).
> >> > Could you tell me how you are using this so far (who branches what
> from
> >> > where, where and how the review happens, and how the changes get
> merged
> >> > back into the ASF repository)?
> >> >
> >> > Thanks,
> >> > Till
> >>
> >
> >
>
Re: GitHub workflow
Posted by Eldon Carman <ec...@ucr.edu>.
I started creating a website site page to outline the process. I created a
github pull request for reviewing the site changes.
https://github.com/apache/vxquery/pull/18
On Sun, Jun 28, 2015 at 6:18 PM, Eldon Carman <ec...@ucr.edu> wrote:
> This process should be written up on our website.
>
> Things to note and could be added to this documentation:
> - The pull request should compare against the Apache VXQuery master
> branch.
> - The code must pass the VXQuery test suite and the previously passing
> XQTS tests. (We have pages to document these procedures.)
> - If the code improves the XQTS test suite performance, we can update our
> local list of passing tests. (Also on our website.)
>
> On Sun, Jun 28, 2015 at 2:05 AM, Efi Kaltirimidou <ef...@gmail.com>
> wrote:
>
>> Yes I will do a pull request today after I make sure all the edited and
>> new
>> file has the correct format.
>>
>> Efi
>> On Jun 28, 2015 2:10 AM, "Till Westmann" <ti...@apache.org> wrote:
>>
>> > Hi,
>> >
>> > I’ve started to work on
>> https://issues.apache.org/jira/browse/VXQUERY-159
>> > <https://issues.apache.org/jira/browse/VXQUERY-159> and I’d like to use
>> > this to understand out GitHub workflow (and potentially add it to the
>> > website).
>> > Could you tell me how you are using this so far (who branches what from
>> > where, where and how the review happens, and how the changes get merged
>> > back into the ASF repository)?
>> >
>> > Thanks,
>> > Till
>>
>
>
Re: GitHub workflow
Posted by Eldon Carman <ec...@ucr.edu>.
This process should be written up on our website.
Things to note and could be added to this documentation:
- The pull request should compare against the Apache VXQuery master branch.
- The code must pass the VXQuery test suite and the previously passing
XQTS tests. (We have pages to document these procedures.)
- If the code improves the XQTS test suite performance, we can update our
local list of passing tests. (Also on our website.)
On Sun, Jun 28, 2015 at 2:05 AM, Efi Kaltirimidou <ef...@gmail.com>
wrote:
> Yes I will do a pull request today after I make sure all the edited and new
> file has the correct format.
>
> Efi
> On Jun 28, 2015 2:10 AM, "Till Westmann" <ti...@apache.org> wrote:
>
> > Hi,
> >
> > I’ve started to work on
> https://issues.apache.org/jira/browse/VXQUERY-159
> > <https://issues.apache.org/jira/browse/VXQUERY-159> and I’d like to use
> > this to understand out GitHub workflow (and potentially add it to the
> > website).
> > Could you tell me how you are using this so far (who branches what from
> > where, where and how the review happens, and how the changes get merged
> > back into the ASF repository)?
> >
> > Thanks,
> > Till
>
Re: GitHub workflow
Posted by Efi Kaltirimidou <ef...@gmail.com>.
Yes I will do a pull request today after I make sure all the edited and new
file has the correct format.
Efi
On Jun 28, 2015 2:10 AM, "Till Westmann" <ti...@apache.org> wrote:
> Hi,
>
> I’ve started to work on https://issues.apache.org/jira/browse/VXQUERY-159
> <https://issues.apache.org/jira/browse/VXQUERY-159> and I’d like to use
> this to understand out GitHub workflow (and potentially add it to the
> website).
> Could you tell me how you are using this so far (who branches what from
> where, where and how the review happens, and how the changes get merged
> back into the ASF repository)?
>
> Thanks,
> Till