You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@couchdb.apache.org by Noah Slater <ns...@apache.org> on 2013/04/12 14:31:49 UTC
Roadmap process and merge procedure
Devs,
With 1.3.0 out, it is time we revisit these docs:
http://wiki.apache.org/couchdb/Roadmap_Process
http://wiki.apache.org/couchdb/Merge_Procedure
Our next bugfix release target is 1st May.
Our next feature release target is 1st July.
What do we need to do *now* to prepare for these?
Do we need to create release branches?
If yes, can we do it, and can we document it, so I can bake it into the
release procedure.
Do we need to communicate how to merge in work for the releases?
Remember we discussed (and sort of half documented in that second wiki
page) that to merge in code for a release, you have to do a VOTE on a
"merge request" to dev, and you have to include tests, and docs, and what
have you, and we do lazy consensus on it.
If we're serious about this release cadence (and I think we all are) then
we need to sort this stuff out ASAP, and communicate it, and actually put
it into practice.
I need your help though, because I am still learning Git, etc. So I am
hoping that a few of you can weigh in on the current state of the merge
procedure proposal, and maybe fix it up. Then, once we're happy with it, I
can do the DISCUSS/VOTE dance on dev@ and make this official.
I am super excited about this.
Thanks,
--
NS
Re: Roadmap process and merge procedure
Posted by Robert Newson <rn...@apache.org>.
Hi Noah,
Yeah, I feel pretty guilty about this one. Ping me tomorrow and I'll
make some time.
B.
On 22 April 2013 18:23, Noah Slater <ns...@apache.org> wrote:
> Following up on this. We are two weeks away from the next release.
>
> Bob, you mentioned on IRC that you could help me with this. What time is
> convenient for you?
>
>
> On 17 April 2013 16:01, Noah Slater <ns...@apache.org> wrote:
>
>> I'll let someone more familiar with Git, and the conversations we had
>> around this, answer.
>>
>> To be honest, I am less interested in debating the specifics of the
>> proposal than I am about actually getting a proposal agreed upon, and
>> putting it into practice. We are a little over a week away from the next
>> bugfix release window, and a little over two months away from the next
>> feature release window.
>>
>> I need someone to help me put this stuff into motion. We keep talking
>> about the new release process / merge procedure, but it's been almost a
>> year now, and nothing has happened. (And I am as much if not more so to
>> blame for that as anyone else.)
>>
>> What would be great is if someone who was involved in fleshing out the
>> original proposal (Bob, Paul, Jan, etc) could lend a hand and pair up with
>> me for an evening to get all this put into motion.
>>
>>
>> On 17 April 2013 15:40, Dirkjan Ochtman <di...@ochtman.nl> wrote:
>>
>>> How does that impact master vs. 1.4.x?
>>>
>>> On Wed, Apr 17, 2013 at 4:36 PM, Noah Slater <ns...@apache.org> wrote:
>>> > The goal was that you only merge in features when they are ready, and
>>> come
>>> > with tests, and docs, and what have you. And that you actually call a
>>> lazy
>>> > consensus "merge request" on dev@ before you can merge in.
>>> >
>>> >
>>> >
>>> >
>>> > On 17 April 2013 15:18, Dirkjan Ochtman <di...@ochtman.nl> wrote:
>>> >
>>> >> On Wed, Apr 17, 2013 at 4:02 PM, Noah Slater <ns...@apache.org>
>>> wrote:
>>> >> > So that features can be merged into it as they become ready.
>>> >> >
>>> >> > Check out:
>>> >> >
>>> >> > http://wiki.apache.org/couchdb/Merge_Procedure
>>> >> >
>>> >> > Thoughts?
>>> >>
>>> >> Seems like you could call the next-feature-release branch "master",
>>> >> and not have to start a new branch every time.
>>> >>
>>> >> Cheers,
>>> >>
>>> >> Dirkjan
>>> >>
>>> >
>>> >
>>> >
>>> > --
>>> > NS
>>>
>>
>>
>>
>> --
>> NS
>>
>
>
>
> --
> NS
Re: Roadmap process and merge procedure
Posted by Noah Slater <ns...@apache.org>.
Following up on this. We are two weeks away from the next release.
Bob, you mentioned on IRC that you could help me with this. What time is
convenient for you?
On 17 April 2013 16:01, Noah Slater <ns...@apache.org> wrote:
> I'll let someone more familiar with Git, and the conversations we had
> around this, answer.
>
> To be honest, I am less interested in debating the specifics of the
> proposal than I am about actually getting a proposal agreed upon, and
> putting it into practice. We are a little over a week away from the next
> bugfix release window, and a little over two months away from the next
> feature release window.
>
> I need someone to help me put this stuff into motion. We keep talking
> about the new release process / merge procedure, but it's been almost a
> year now, and nothing has happened. (And I am as much if not more so to
> blame for that as anyone else.)
>
> What would be great is if someone who was involved in fleshing out the
> original proposal (Bob, Paul, Jan, etc) could lend a hand and pair up with
> me for an evening to get all this put into motion.
>
>
> On 17 April 2013 15:40, Dirkjan Ochtman <di...@ochtman.nl> wrote:
>
>> How does that impact master vs. 1.4.x?
>>
>> On Wed, Apr 17, 2013 at 4:36 PM, Noah Slater <ns...@apache.org> wrote:
>> > The goal was that you only merge in features when they are ready, and
>> come
>> > with tests, and docs, and what have you. And that you actually call a
>> lazy
>> > consensus "merge request" on dev@ before you can merge in.
>> >
>> >
>> >
>> >
>> > On 17 April 2013 15:18, Dirkjan Ochtman <di...@ochtman.nl> wrote:
>> >
>> >> On Wed, Apr 17, 2013 at 4:02 PM, Noah Slater <ns...@apache.org>
>> wrote:
>> >> > So that features can be merged into it as they become ready.
>> >> >
>> >> > Check out:
>> >> >
>> >> > http://wiki.apache.org/couchdb/Merge_Procedure
>> >> >
>> >> > Thoughts?
>> >>
>> >> Seems like you could call the next-feature-release branch "master",
>> >> and not have to start a new branch every time.
>> >>
>> >> Cheers,
>> >>
>> >> Dirkjan
>> >>
>> >
>> >
>> >
>> > --
>> > NS
>>
>
>
>
> --
> NS
>
--
NS
Re: Roadmap process and merge procedure
Posted by Noah Slater <ns...@apache.org>.
I'll let someone more familiar with Git, and the conversations we had
around this, answer.
To be honest, I am less interested in debating the specifics of the
proposal than I am about actually getting a proposal agreed upon, and
putting it into practice. We are a little over a week away from the next
bugfix release window, and a little over two months away from the next
feature release window.
I need someone to help me put this stuff into motion. We keep talking about
the new release process / merge procedure, but it's been almost a year now,
and nothing has happened. (And I am as much if not more so to blame for
that as anyone else.)
What would be great is if someone who was involved in fleshing out the
original proposal (Bob, Paul, Jan, etc) could lend a hand and pair up with
me for an evening to get all this put into motion.
On 17 April 2013 15:40, Dirkjan Ochtman <di...@ochtman.nl> wrote:
> How does that impact master vs. 1.4.x?
>
> On Wed, Apr 17, 2013 at 4:36 PM, Noah Slater <ns...@apache.org> wrote:
> > The goal was that you only merge in features when they are ready, and
> come
> > with tests, and docs, and what have you. And that you actually call a
> lazy
> > consensus "merge request" on dev@ before you can merge in.
> >
> >
> >
> >
> > On 17 April 2013 15:18, Dirkjan Ochtman <di...@ochtman.nl> wrote:
> >
> >> On Wed, Apr 17, 2013 at 4:02 PM, Noah Slater <ns...@apache.org>
> wrote:
> >> > So that features can be merged into it as they become ready.
> >> >
> >> > Check out:
> >> >
> >> > http://wiki.apache.org/couchdb/Merge_Procedure
> >> >
> >> > Thoughts?
> >>
> >> Seems like you could call the next-feature-release branch "master",
> >> and not have to start a new branch every time.
> >>
> >> Cheers,
> >>
> >> Dirkjan
> >>
> >
> >
> >
> > --
> > NS
>
--
NS
Re: Roadmap process and merge procedure
Posted by Dirkjan Ochtman <di...@ochtman.nl>.
How does that impact master vs. 1.4.x?
On Wed, Apr 17, 2013 at 4:36 PM, Noah Slater <ns...@apache.org> wrote:
> The goal was that you only merge in features when they are ready, and come
> with tests, and docs, and what have you. And that you actually call a lazy
> consensus "merge request" on dev@ before you can merge in.
>
>
>
>
> On 17 April 2013 15:18, Dirkjan Ochtman <di...@ochtman.nl> wrote:
>
>> On Wed, Apr 17, 2013 at 4:02 PM, Noah Slater <ns...@apache.org> wrote:
>> > So that features can be merged into it as they become ready.
>> >
>> > Check out:
>> >
>> > http://wiki.apache.org/couchdb/Merge_Procedure
>> >
>> > Thoughts?
>>
>> Seems like you could call the next-feature-release branch "master",
>> and not have to start a new branch every time.
>>
>> Cheers,
>>
>> Dirkjan
>>
>
>
>
> --
> NS
Re: Roadmap process and merge procedure
Posted by Noah Slater <ns...@apache.org>.
The goal was that you only merge in features when they are ready, and come
with tests, and docs, and what have you. And that you actually call a lazy
consensus "merge request" on dev@ before you can merge in.
On 17 April 2013 15:18, Dirkjan Ochtman <di...@ochtman.nl> wrote:
> On Wed, Apr 17, 2013 at 4:02 PM, Noah Slater <ns...@apache.org> wrote:
> > So that features can be merged into it as they become ready.
> >
> > Check out:
> >
> > http://wiki.apache.org/couchdb/Merge_Procedure
> >
> > Thoughts?
>
> Seems like you could call the next-feature-release branch "master",
> and not have to start a new branch every time.
>
> Cheers,
>
> Dirkjan
>
--
NS
Re: Roadmap process and merge procedure
Posted by Dirkjan Ochtman <di...@ochtman.nl>.
On Wed, Apr 17, 2013 at 4:02 PM, Noah Slater <ns...@apache.org> wrote:
> So that features can be merged into it as they become ready.
>
> Check out:
>
> http://wiki.apache.org/couchdb/Merge_Procedure
>
> Thoughts?
Seems like you could call the next-feature-release branch "master",
and not have to start a new branch every time.
Cheers,
Dirkjan
Re: Roadmap process and merge procedure
Posted by Noah Slater <ns...@apache.org>.
So that features can be merged into it as they become ready.
Check out:
http://wiki.apache.org/couchdb/Merge_Procedure
Thoughts?
On 17 April 2013 14:47, Dirkjan Ochtman <di...@ochtman.nl> wrote:
> On Wed, Apr 17, 2013 at 3:45 PM, Noah Slater <ns...@apache.org> wrote:
> > At a minimum, we need to create the 1.4.x branch. But I'd really like for
> > us to properly document our merge procedure (which has languished
> because I
> > don't know Git well enough to fill out the details) and then for us to
> call
> > a vote on it, so that we can move forward as we originally planned to,
> with
> > features only landing on a release branch with tests, docs, etc.
>
> Sorry, this might just be me, but why would you want to branch for
> 1.4.x now instead of, like, 2 (or 4) weeks before the intended release
> date?
>
> Cheers,
>
> Dirkjan
>
--
NS
Re: Roadmap process and merge procedure
Posted by Dirkjan Ochtman <di...@ochtman.nl>.
On Wed, Apr 17, 2013 at 3:45 PM, Noah Slater <ns...@apache.org> wrote:
> At a minimum, we need to create the 1.4.x branch. But I'd really like for
> us to properly document our merge procedure (which has languished because I
> don't know Git well enough to fill out the details) and then for us to call
> a vote on it, so that we can move forward as we originally planned to, with
> features only landing on a release branch with tests, docs, etc.
Sorry, this might just be me, but why would you want to branch for
1.4.x now instead of, like, 2 (or 4) weeks before the intended release
date?
Cheers,
Dirkjan
Re: Roadmap process and merge procedure
Posted by Noah Slater <ns...@apache.org>.
Hey guys,
Just following up on this, as it's been five days. And I can't move ahead
without help.
At a minimum, we need to create the 1.4.x branch. But I'd really like for
us to properly document our merge procedure (which has languished because I
don't know Git well enough to fill out the details) and then for us to call
a vote on it, so that we can move forward as we originally planned to, with
features only landing on a release branch with tests, docs, etc.
If someone wants to volunteer to pair with me, perhaps we can knock this
out?
Thanks,
On 12 April 2013 13:31, Noah Slater <ns...@apache.org> wrote:
> Devs,
>
> With 1.3.0 out, it is time we revisit these docs:
>
> http://wiki.apache.org/couchdb/Roadmap_Process
>
> http://wiki.apache.org/couchdb/Merge_Procedure
>
> Our next bugfix release target is 1st May.
>
> Our next feature release target is 1st July.
>
> What do we need to do *now* to prepare for these?
>
> Do we need to create release branches?
>
> If yes, can we do it, and can we document it, so I can bake it into the
> release procedure.
>
> Do we need to communicate how to merge in work for the releases?
>
> Remember we discussed (and sort of half documented in that second wiki
> page) that to merge in code for a release, you have to do a VOTE on a
> "merge request" to dev, and you have to include tests, and docs, and what
> have you, and we do lazy consensus on it.
>
> If we're serious about this release cadence (and I think we all are) then
> we need to sort this stuff out ASAP, and communicate it, and actually put
> it into practice.
>
> I need your help though, because I am still learning Git, etc. So I am
> hoping that a few of you can weigh in on the current state of the merge
> procedure proposal, and maybe fix it up. Then, once we're happy with it, I
> can do the DISCUSS/VOTE dance on dev@ and make this official.
>
> I am super excited about this.
>
> Thanks,
>
> --
> NS
>
--
NS