You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@geode.apache.org by Neil Stevenson <ne...@em-chips.co.uk> on 2015/05/26 23:51:11 UTC

Patch for Geode - Gfsh init script

Hi,
    I have a patch ready to ship for Geode, two amended files and two 
unit tests

  Although the instructions are a little unclear, I'm assuming we branch 
from "develop". Not "master" I hope.

  If so, how should I name my branch ? Do we need a feature request first ?

  Eg. is the branch "feature/GEODE-123" matching against a Jira


  The patch itself is fairly small, reinstating ".gfsh2rc" init file 
handling in $GEODE/bin/gfsh
that disappeared in the transition from GF 6.6 to 7.0

  Obviously this will need amendment once the "gfsh" naming issue 
concludes.

Neil

Re: Patch for Geode - Gfsh init script

Posted by Dan Smith <ds...@pivotal.io>.
I agree you should mention the JIRA in the first line of commit message.

If we can get JIRA-git integration hooked up that will also have the effect
of creating a link from the JIRA to the commit:
http://www.apache.org/dev/svngit2jira.html

On Tue, May 26, 2015 at 3:31 PM, Josh Fischer <jo...@gmail.com>
wrote:

> Hi All,
>
> I'm completely new to the project and I wanted to follow along for a bit
> before I jumped in an made any comments, but I I think I have some possible
> ideas on how to approach this branch name problem/question..  Like Dan
> said, always branch from develop, master is never touched until after a
> release branch has been cut and finished.  I also think it is note worthy
> to say that the the feature tracking number from Jira should be placed in
> the commit message.  The reason I say this is because once that branch is
> merged back to develop there will not be any tags that contain the feature
> branch's name.  As in, there will not be a reference to the
> feature/GEODE-123 branch anymore.  So after everything is all said and
> done, the only reference we have to a certain "feature" being finished is
> what is left in the commit messages.  I hope this email made sense and I
> hope I can help out more in the future.
>
> Let me know your thoughts!
>
> -Josh
>
> On Tue, May 26, 2015 at 5:17 PM, Dan Smith <ds...@pivotal.io> wrote:
>
> > Definitely branch from develop - master shouldn't get touched until we
> > release.
> >
> > I think creating a JIRA for the feature request and mentioning it in the
> > branch name is a good practice.
> >
> > -Dan
> >
> >
> > On Tue, May 26, 2015 at 2:51 PM, Neil Stevenson <
> > neil.stevenson@em-chips.co.uk> wrote:
> >
> > > Hi,
> > >    I have a patch ready to ship for Geode, two amended files and two
> unit
> > > tests
> > >
> > >  Although the instructions are a little unclear, I'm assuming we branch
> > > from "develop". Not "master" I hope.
> > >
> > >  If so, how should I name my branch ? Do we need a feature request
> first
> > ?
> > >
> > >  Eg. is the branch "feature/GEODE-123" matching against a Jira
> > >
> > >
> > >  The patch itself is fairly small, reinstating ".gfsh2rc" init file
> > > handling in $GEODE/bin/gfsh
> > > that disappeared in the transition from GF 6.6 to 7.0
> > >
> > >  Obviously this will need amendment once the "gfsh" naming issue
> > concludes.
> > >
> > > Neil
> > >
> >
>

Re: Patch for Geode - Gfsh init script

Posted by Josh Fischer <jo...@gmail.com>.
Hi All,

I'm completely new to the project and I wanted to follow along for a bit
before I jumped in an made any comments, but I I think I have some possible
ideas on how to approach this branch name problem/question..  Like Dan
said, always branch from develop, master is never touched until after a
release branch has been cut and finished.  I also think it is note worthy
to say that the the feature tracking number from Jira should be placed in
the commit message.  The reason I say this is because once that branch is
merged back to develop there will not be any tags that contain the feature
branch's name.  As in, there will not be a reference to the
feature/GEODE-123 branch anymore.  So after everything is all said and
done, the only reference we have to a certain "feature" being finished is
what is left in the commit messages.  I hope this email made sense and I
hope I can help out more in the future.

Let me know your thoughts!

-Josh

On Tue, May 26, 2015 at 5:17 PM, Dan Smith <ds...@pivotal.io> wrote:

> Definitely branch from develop - master shouldn't get touched until we
> release.
>
> I think creating a JIRA for the feature request and mentioning it in the
> branch name is a good practice.
>
> -Dan
>
>
> On Tue, May 26, 2015 at 2:51 PM, Neil Stevenson <
> neil.stevenson@em-chips.co.uk> wrote:
>
> > Hi,
> >    I have a patch ready to ship for Geode, two amended files and two unit
> > tests
> >
> >  Although the instructions are a little unclear, I'm assuming we branch
> > from "develop". Not "master" I hope.
> >
> >  If so, how should I name my branch ? Do we need a feature request first
> ?
> >
> >  Eg. is the branch "feature/GEODE-123" matching against a Jira
> >
> >
> >  The patch itself is fairly small, reinstating ".gfsh2rc" init file
> > handling in $GEODE/bin/gfsh
> > that disappeared in the transition from GF 6.6 to 7.0
> >
> >  Obviously this will need amendment once the "gfsh" naming issue
> concludes.
> >
> > Neil
> >
>

Re: Patch for Geode - Gfsh init script

Posted by Josh Fischer <jo...@gmail.com>.
I agree, CI should be pointing at develop.

-Josh Fischer

On Wed, May 27, 2015 at 10:35 AM, Anthony Baker <ab...@pivotal.io> wrote:

> Yes, we should switch CI to point at /develop.
>
> Anthony
>
> > On May 26, 2015, at 5:25 PM, Roman Shaposhnik <ro...@shaposhnik.org>
> wrote:
> >
> > On Tue, May 26, 2015 at 3:17 PM, Dan Smith <ds...@pivotal.io> wrote:
> >> Definitely branch from develop - master shouldn't get touched until we
> >> release.
> >>
> >> I think creating a JIRA for the feature request and mentioning it in the
> >> branch name is a good practice.
> >
> > Question: are we comfortable with the decision of using develop
> > as the place for on-going development and nightly builds?  Currently,
> > our jenkins builds from master which seems to be useless once
> > fixes start flowing into develop.
> >
> > Thanks,
> > Roman.
>
>

Re: Patch for Geode - Gfsh init script

Posted by Anthony Baker <ab...@pivotal.io>.
Yes, we should switch CI to point at /develop.

Anthony

> On May 26, 2015, at 5:25 PM, Roman Shaposhnik <ro...@shaposhnik.org> wrote:
> 
> On Tue, May 26, 2015 at 3:17 PM, Dan Smith <ds...@pivotal.io> wrote:
>> Definitely branch from develop - master shouldn't get touched until we
>> release.
>> 
>> I think creating a JIRA for the feature request and mentioning it in the
>> branch name is a good practice.
> 
> Question: are we comfortable with the decision of using develop
> as the place for on-going development and nightly builds?  Currently,
> our jenkins builds from master which seems to be useless once
> fixes start flowing into develop.
> 
> Thanks,
> Roman.


Re: Patch for Geode - Gfsh init script

Posted by William Markito <wm...@pivotal.io>.
Hi Neil, are you trying to use github or asf git ?

GitHub is only a mirror but you should be able to submit PR's or  to commit
using ASF Git.

I'm currently working on a wiki page with more step-by-step guidance based
on our recent discussions on the list.

On Wed, May 27, 2015 at 2:38 PM, Neil Stevenson <
neil.stevenson@em-chips.co.uk> wrote:

>
>  I was trying to follow git-flow naming without insisting we use it.
>
>  However, the point I was trying to make is I don't have the access rights
> to create a branch
>
>  Who grants these ?
>
>
>
> On 27/05/2015 11:29, Pid wrote:
>
>> On 27/05/2015 08:51, Neil Stevenson wrote:
>>
>>>   Ok, given we have a Jira for this now GEODE-38, we should have a branch
>>> from develop for it
>>>
>>>   Should I be able to create branch "feature/GEODE-38" from *develop* ? I
>>> can't currently
>>>
>> I recommend you look for a git-flow installation for your OS.
>>
>> When installed & configured, (the suggested defaults will do), it will
>> extend git, adding some commands.
>>
>> If you have a shell prompt that is configured to show a git branch,
>> you'd execute the command:
>>
>> pid@host:asf/geode (develop =)$ git flow feature start
>> GEODE-38_init_script
>>
>> and then see it has created the branch:
>>
>>   pid@host:asf/geode (feature/GEODE-38_init_script)$
>>
>> You execute:
>>
>>   pid@host:asf/geode (feature/GEODE-38_init_script)$ git flow feature
>> finish GEODE-38_init_script
>>
>> and it merges back to develop.
>>
>>
>> At which point, I recommend that you ensure that your develop is up to
>> date before finishing any feature branches - and when pulling develop,
>> use --rebase.
>>
>>   pid@host:asf/geode (develop =)$ git pull --rebase
>>
>>
>> p
>>
>>
>>    It'll be difficult to push without this. I could send a "*.patch" file
>>> but then someone else needs
>>> to apply it, much more work
>>>
>>> N
>>>
>>>
>>> On 27/05/2015 01:27, William Markito wrote:
>>>
>>>> +1 for develop
>>>>
>>>> On Tue, May 26, 2015 at 5:25 PM, Roman Shaposhnik <roman@shaposhnik.org
>>>> >
>>>> wrote:
>>>>
>>>>  On Tue, May 26, 2015 at 3:17 PM, Dan Smith <ds...@pivotal.io> wrote:
>>>>>
>>>>>> Definitely branch from develop - master shouldn't get touched until we
>>>>>> release.
>>>>>>
>>>>>> I think creating a JIRA for the feature request and mentioning it in
>>>>>> the
>>>>>> branch name is a good practice.
>>>>>>
>>>>> Question: are we comfortable with the decision of using develop
>>>>> as the place for on-going development and nightly builds?  Currently,
>>>>> our jenkins builds from master which seems to be useless once
>>>>> fixes start flowing into develop.
>>>>>
>>>>> Thanks,
>>>>> Roman.
>>>>>
>>>>>
>>>>
>>
>


-- 

William Markito Oliveira

-- For questions about Apache Geode, please write to
*dev@geode.incubator.apache.org
<de...@geode.incubator.apache.org>*

Re: Patch for Geode - Gfsh init script

Posted by Neil Stevenson <ne...@em-chips.co.uk>.
  I was trying to follow git-flow naming without insisting we use it.

  However, the point I was trying to make is I don't have the access 
rights to create a branch

  Who grants these ?


On 27/05/2015 11:29, Pid wrote:
> On 27/05/2015 08:51, Neil Stevenson wrote:
>>   Ok, given we have a Jira for this now GEODE-38, we should have a branch
>> from develop for it
>>
>>   Should I be able to create branch "feature/GEODE-38" from *develop* ? I
>> can't currently
> I recommend you look for a git-flow installation for your OS.
>
> When installed & configured, (the suggested defaults will do), it will
> extend git, adding some commands.
>
> If you have a shell prompt that is configured to show a git branch,
> you'd execute the command:
>
> pid@host:asf/geode (develop =)$ git flow feature start GEODE-38_init_script
>
> and then see it has created the branch:
>
>   pid@host:asf/geode (feature/GEODE-38_init_script)$
>
> You execute:
>
>   pid@host:asf/geode (feature/GEODE-38_init_script)$ git flow feature
> finish GEODE-38_init_script
>
> and it merges back to develop.
>
>
> At which point, I recommend that you ensure that your develop is up to
> date before finishing any feature branches - and when pulling develop,
> use --rebase.
>
>   pid@host:asf/geode (develop =)$ git pull --rebase
>
>
> p
>
>
>>   It'll be difficult to push without this. I could send a "*.patch" file
>> but then someone else needs
>> to apply it, much more work
>>
>> N
>>
>>
>> On 27/05/2015 01:27, William Markito wrote:
>>> +1 for develop
>>>
>>> On Tue, May 26, 2015 at 5:25 PM, Roman Shaposhnik <ro...@shaposhnik.org>
>>> wrote:
>>>
>>>> On Tue, May 26, 2015 at 3:17 PM, Dan Smith <ds...@pivotal.io> wrote:
>>>>> Definitely branch from develop - master shouldn't get touched until we
>>>>> release.
>>>>>
>>>>> I think creating a JIRA for the feature request and mentioning it in
>>>>> the
>>>>> branch name is a good practice.
>>>> Question: are we comfortable with the decision of using develop
>>>> as the place for on-going development and nightly builds?  Currently,
>>>> our jenkins builds from master which seems to be useless once
>>>> fixes start flowing into develop.
>>>>
>>>> Thanks,
>>>> Roman.
>>>>
>>>
>


Re: Patch for Geode - Gfsh init script

Posted by Pid <pi...@pidster.com>.
On 27/05/2015 08:51, Neil Stevenson wrote:
> 
>  Ok, given we have a Jira for this now GEODE-38, we should have a branch
> from develop for it
> 
>  Should I be able to create branch "feature/GEODE-38" from *develop* ? I
> can't currently

I recommend you look for a git-flow installation for your OS.

When installed & configured, (the suggested defaults will do), it will
extend git, adding some commands.

If you have a shell prompt that is configured to show a git branch,
you'd execute the command:

pid@host:asf/geode (develop =)$ git flow feature start GEODE-38_init_script

and then see it has created the branch:

 pid@host:asf/geode (feature/GEODE-38_init_script)$

You execute:

 pid@host:asf/geode (feature/GEODE-38_init_script)$ git flow feature
finish GEODE-38_init_script

and it merges back to develop.


At which point, I recommend that you ensure that your develop is up to
date before finishing any feature branches - and when pulling develop,
use --rebase.

 pid@host:asf/geode (develop =)$ git pull --rebase


p


>  It'll be difficult to push without this. I could send a "*.patch" file
> but then someone else needs
> to apply it, much more work
> 
> N
> 
> 
> On 27/05/2015 01:27, William Markito wrote:
>> +1 for develop
>>
>> On Tue, May 26, 2015 at 5:25 PM, Roman Shaposhnik <ro...@shaposhnik.org>
>> wrote:
>>
>>> On Tue, May 26, 2015 at 3:17 PM, Dan Smith <ds...@pivotal.io> wrote:
>>>> Definitely branch from develop - master shouldn't get touched until we
>>>> release.
>>>>
>>>> I think creating a JIRA for the feature request and mentioning it in
>>>> the
>>>> branch name is a good practice.
>>> Question: are we comfortable with the decision of using develop
>>> as the place for on-going development and nightly builds?  Currently,
>>> our jenkins builds from master which seems to be useless once
>>> fixes start flowing into develop.
>>>
>>> Thanks,
>>> Roman.
>>>
>>
>>
> 


-- 

[key:62590808]

Re: Patch for Geode - Gfsh init script

Posted by Neil Stevenson <ne...@em-chips.co.uk>.
  Ok, given we have a Jira for this now GEODE-38, we should have a 
branch from develop for it

  Should I be able to create branch "feature/GEODE-38" from *develop* ? 
I can't currently

  It'll be difficult to push without this. I could send a "*.patch" file 
but then someone else needs
to apply it, much more work

N


On 27/05/2015 01:27, William Markito wrote:
> +1 for develop
>
> On Tue, May 26, 2015 at 5:25 PM, Roman Shaposhnik <ro...@shaposhnik.org>
> wrote:
>
>> On Tue, May 26, 2015 at 3:17 PM, Dan Smith <ds...@pivotal.io> wrote:
>>> Definitely branch from develop - master shouldn't get touched until we
>>> release.
>>>
>>> I think creating a JIRA for the feature request and mentioning it in the
>>> branch name is a good practice.
>> Question: are we comfortable with the decision of using develop
>> as the place for on-going development and nightly builds?  Currently,
>> our jenkins builds from master which seems to be useless once
>> fixes start flowing into develop.
>>
>> Thanks,
>> Roman.
>>
>
>


Re: Patch for Geode - Gfsh init script

Posted by William Markito <wm...@pivotal.io>.
+1 for develop

On Tue, May 26, 2015 at 5:25 PM, Roman Shaposhnik <ro...@shaposhnik.org>
wrote:

> On Tue, May 26, 2015 at 3:17 PM, Dan Smith <ds...@pivotal.io> wrote:
> > Definitely branch from develop - master shouldn't get touched until we
> > release.
> >
> > I think creating a JIRA for the feature request and mentioning it in the
> > branch name is a good practice.
>
> Question: are we comfortable with the decision of using develop
> as the place for on-going development and nightly builds?  Currently,
> our jenkins builds from master which seems to be useless once
> fixes start flowing into develop.
>
> Thanks,
> Roman.
>



-- 

William Markito Oliveira

-- For questions about Apache Geode, please write to
*dev@geode.incubator.apache.org
<de...@geode.incubator.apache.org>*

Re: Patch for Geode - Gfsh init script

Posted by Roman Shaposhnik <ro...@shaposhnik.org>.
On Tue, May 26, 2015 at 3:17 PM, Dan Smith <ds...@pivotal.io> wrote:
> Definitely branch from develop - master shouldn't get touched until we
> release.
>
> I think creating a JIRA for the feature request and mentioning it in the
> branch name is a good practice.

Question: are we comfortable with the decision of using develop
as the place for on-going development and nightly builds?  Currently,
our jenkins builds from master which seems to be useless once
fixes start flowing into develop.

Thanks,
Roman.

Re: Patch for Geode - Gfsh init script

Posted by Dan Smith <ds...@pivotal.io>.
Definitely branch from develop - master shouldn't get touched until we
release.

I think creating a JIRA for the feature request and mentioning it in the
branch name is a good practice.

-Dan


On Tue, May 26, 2015 at 2:51 PM, Neil Stevenson <
neil.stevenson@em-chips.co.uk> wrote:

> Hi,
>    I have a patch ready to ship for Geode, two amended files and two unit
> tests
>
>  Although the instructions are a little unclear, I'm assuming we branch
> from "develop". Not "master" I hope.
>
>  If so, how should I name my branch ? Do we need a feature request first ?
>
>  Eg. is the branch "feature/GEODE-123" matching against a Jira
>
>
>  The patch itself is fairly small, reinstating ".gfsh2rc" init file
> handling in $GEODE/bin/gfsh
> that disappeared in the transition from GF 6.6 to 7.0
>
>  Obviously this will need amendment once the "gfsh" naming issue concludes.
>
> Neil
>