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 jhs@iriscouch.com designates
 209.85.217.177 as permitted sender)
MIME-Version: 1.0
In-Reply-To: 
 <CAJNb-9pKdUeUmxSvbXLa4zfdX674FKza+Xb8_uB0PFc1ckMGog@mail.gmail.com>
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>
 <CAJNb-9pBmGfwiqzW4aeLu-abwegeiEP7gfri3zMfKTxYiZESyw@mail.gmail.com>
 <CAPaJBx7KZaLzX1MZgjUOccB4Q557V7ceMuWEP=_Gts9fC9ksqw@mail.gmail.com>
 <CAJNb-9pKdUeUmxSvbXLa4zfdX674FKza+Xb8_uB0PFc1ckMGog@mail.gmail.com>
From: Jason Smith <jhs@iriscouch.com>
Date: Wed, 5 Jun 2013 03:53:40 +0000
Message-ID: 
 <CAN-3CBJVDqFfOWBGZ5RfL-dQ3W+CH_g6gQHDWYOvnKjOouZv4A@mail.gmail.com>
Subject: Re: [DISCUSS] Git workflow
To: CouchDB Developers <dev@couchdb.apache.org>
Content-Type: text/plain; charset=UTF-8

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