Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Received-SPF: pass (nike.apache.org: domain of nslater@tumbolia.org designates
 209.85.217.180 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <15DD6B3E-E4B2-4202-A328-D574529164FE@apache.org>
References: 
 <CA+Y+4453Y9qUcRVh17iaPfjU2G5AHCFC-5AFb4OEwpvVvO-MQw@mail.gmail.com>
	<15DD6B3E-E4B2-4202-A328-D574529164FE@apache.org>
Date: Sun, 17 Jun 2012 17:48:58 +0100
Message-ID: 
 <CA+Y+446N=LyJWfx3skAqJJUbeWw=n_srUhBi-ZmRF1bW9Df+Xw@mail.gmail.com>
Subject: Re: [PROPOSAL] Official roadmap, and merge procedure
From: Noah Slater <nslater@tumbolia.org>
To: dev@couchdb.apache.org
Content-Type: multipart/alternative; boundary=bcaec554d5226c3e9104c2add336

--bcaec554d5226c3e9104c2add336
Content-Type: text/plain; charset=ISO-8859-1

Thanks for the comments guys.

Bob was in the room when this proposal was drafted (literally) but Paul is
our other active release manager, so I want to wait for his review before I
comment on anything in the thread. I am also interested to hear what Jason
Smith thinks, and indeed, anyone else from Cloudant, or other downstream
CouchDB individuals this may effect. If you're interested in helping the
CouchDB community test CouchDB, through QA, CI, or any other method, then
your should also chime in here.

On Sun, Jun 17, 2012 at 4:28 PM, Jan Lehnardt <jan@apache.org> wrote:

>
> On Jun 16, 2012, at 18:45 , Noah Slater wrote:
>
> > Devs,
> >
> > A few of us met in Dublin recently, and we discussed the project roadmap.
> >
> > Key takeaways from that meeting:
> >
> > 1. We'd like to proposed formal time-based releases
> >
> >
> > 2. Branch and hack all you like, but if you want to ship something, you
> > have to submit a merge request to an active release branch. Before you do
> > this, you should follow a test procedure. And before your request will be
> > accepted, it will be put through QA by the community.
> >
> >
> > Details of these proposals can be found here:
> >
> > http://wiki.apache.org/couchdb/Roadmap_Process
> >
> >
> > http://wiki.apache.org/couchdb/Merge_Procedure
> >
> >
> > Please reply back to this thread with your comments on the proposals.
> >
> > (The last one needs to be fleshed out, a little...)
>
> In particular this bit:
>
> > Feature branches are merged to release branches using 'git merge --no-ff
> <FEATURE BRANCH>'. This guarantees a merge commit, which are the only kinds
> of commit that will appear on release branches. If the merge results in
> conflicts, the release manager rejects the merge commit with an reply to
> the dev@ thread. If the merge is successful, the release manager should
> run 'make distcheck' and push the merge upstream if the tests pass.
>
> Merges are currently not allowed on release branches and master. IIRC we
> came up with git merge --no-ff being "safe" to enable, but this currently
> is still disabled.
>
> Cheers
> Jan
> --
>
>

--bcaec554d5226c3e9104c2add336--