Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Received-SPF: pass (athena.apache.org: domain of jason.h.smith@gmail.com
 designates 209.85.214.175 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <7278D799-5B2A-454D-972C-80A5B6AC27F0@apache.org>
References: 
 <CABvT1DEWv4LA6mXp=+58t5yUEFVREQ7TEvQkoPsKg09bnH8PtA@mail.gmail.com>
 <CAPaJBx7phxVb5Ec+vbEytUXe88aUkAyxbbV0WnUOuBav_41SVQ@mail.gmail.com>
 <CAD2UGCXzjDt7FsxFbhQiL_YWiTCOowdFS7GKqW=Ffzbt6bzR_Q@mail.gmail.com>
 <CAPaJBx41=vxO808mtPPw3BuVYBiKuBZhig_iOHb75Ov5isgr0w@mail.gmail.com>
 <CABvT1DG27VhdUyxqXeo6=eKVEzEOvZmUTgTHA1PMrT-=+kBm2A@mail.gmail.com>
 <CAAL6JQgng76tWWqM7NmZSbzyA2b84hRa6AnV-X_HFkiPdkLVfw@mail.gmail.com>
 <CAL+Y1nvyYyr+eWqS7pO+ypoy2eXCNfgMifi+4-d+qse7B+uKew@mail.gmail.com>
 <CABvT1DGeE+PNuScZKip_Pv-1sK_ySN3+Lgc3jYmKrBmUmQXP1g@mail.gmail.com>
 <CAJNb-9qFXr=brq3AmZxQK60t625VB22TC-zPq5VMCLtddk5KyQ@mail.gmail.com>
 <CABvT1DGGMq-41fF2nAmpjrWnykFo+GRcFcMDM7XeFFWnVNGHeA@mail.gmail.com>
 <CAPaJBx4nY+9871TTimjHvmLv6q0w8ft9ZQ=p4sUscE260mmsdQ@mail.gmail.com>
 <CAL+Y1nvGFwH=1Wh0Bh+GFE1x7WWc6US-FnAY1xKLPwe4VbRRTQ@mail.gmail.com>
 <CAPaJBx7rXJdxwopzDobpeNjwGGHL9afv0e1Y6gYG-dJgiBwxDw@mail.gmail.com>
 <CAL+Y1nufiOW5Y0r+2=p_0bVf=qwe4CX_Y++cp8GBSidigtWQ3Q@mail.gmail.com>
 <CAPaJBx7KZaLzX1MZgjUOccB4Q557V7ceMuWEP=_Gts9fC9ksqw@mail.gmail.com>
 <CAJNb-9pKdUeUmxSvbXLa4zfdX674FKza+Xb8_uB0PFc1ckMGog@mail.gmail.com>
 <CAN-3CBJVDqFfOWBGZ5RfL-dQ3W+CH_g6gQHDWYOvnKjOouZv4A@mail.gmail.com>
 <7278D799-5B2A-454D-972C-80A5B6AC27F0@apache.org>
From: Jason Smith <jason.h.smith@gmail.com>
Date: Thu, 6 Jun 2013 15:31:10 +0700
Message-ID: 
 <CACLy94UmKTv0xpz+fHRmz5prm=9YiL5UBOr0rX_qknTFP=fH+g@mail.gmail.com>
Subject: Re: [DISCUSS] Git workflow
To: "dev@couchdb.apache.org" <dev@couchdb.apache.org>
Content-Type: multipart/alternative; boundary=047d7b5d339e29875504de782433

--047d7b5d339e29875504de782433
Content-Type: text/plain; charset=UTF-8

I kind of share Garren's question of whether commit messages can convert
into release notes. But I figured I'd let it it play out to see how it
works. What if somebody refactors code to remove some bloat?

I still like it, because the perfect is the enemy of the good. It will
still take manual effort to make good release notes, but the effort might
be reduced.


On Thu, Jun 6, 2013 at 2:58 PM, Garren Smith <garren@apache.org> wrote:

> I agree with Jason and Bob, the simplest way is going to be the easiest
> for us to implement.
>
> With us wanting to use commit messages in the release notes, could we not
> mark specific commit messages e.g. [Release Notes] so that only specific
> commit messages get added into the release notes and other commits get
> ignored.
>
> Cheers
> Garren
>
> On 05 Jun 2013, at 5:53 AM, Jason Smith <jhs@iriscouch.com> wrote:
>
> > To a first approximation, I like Bob Newson's idea (option 1 in the
> > OP). It seems the most workable for a large distributed team of
> > volunteers.
> >
> > I am probably a bad teammate, but I always find myself forgetting or
> > misunderstanding policies and changes to policies. So I like the
> > simplest, most intuitive rules that work, e.g. "Features in a branch,
> > merge to master when you're done. Cherry pick backports."
> >
> > On Fri, May 24, 2013 at 6:51 PM, Benoit Chesneau <bchesneau@gmail.com>
> wrote:
> >> On Fri, May 24, 2013 at 6:32 PM, Noah Slater <nslater@apache.org>
> wrote:
> >>> Activity from elsewhere:
> >>>
> >>> http://markmail.org/message/5pxv3ni6qvc2k2jo
> >>>
> >>> http://markmail.org/message/czkylvo2wvbrrikj
> >>>
> >>> http://markmail.org/message/2ybvoo2yjwxmfwze
> >>>
> >>> http://markmail.org/message/ohjwjh6ri72yuagh
> >>>
> >>> http://markmail.org/message/v767rozacnwowlpg
> >>>
> >>> http://markmail.org/message/ftbd5qbv33iq7uxu
> >>>
> >>> Hopefully we can continue the discussion here and resolve this soon.
> I'm
> >>> hoping the people with the strongest opinions here (lookin at you Bob,
> >>> Randal, and Dirkjan) feel empowered to JFDI. If you don't, ... JFDI. ;)
> >>>
> >>
> >> More useful than these links hat is your summary about this activity?
> >> There are a lot of different issues in them as I see it and not all
> >> related to the workflow.
> >>
> >> To add my 2 cents I would go to something like git workflow:
> >>
> >> master : always stable, these contains all the patch coming from
> >> features and fix/branch. Always rebase on master
> >> develop : branch that contain patches from features and fixed before
> >> they can be applied to the master. Here mainly for CI . merge  and
> >> force are accepted on develo. force is accepted so we can clean it for
> >> test
> >>
> >> fix/... for fixes
> >> features/... for features
> >>
> >> release/X.X supported branches
> >>
> >> tags for releases.
> >>
> >>
> >> - benoit
> >
> >
> >
> > --
> > Iris Couch
>
>

--047d7b5d339e29875504de782433--