Return-Path: 
 <dev-return-22510-apmail-couchdb-dev-archive=couchdb.apache.org@couchdb.apache.org>
X-Original-To: apmail-couchdb-dev-archive@www.apache.org
Delivered-To: apmail-couchdb-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B0A0A9214
	for <apmail-couchdb-dev-archive@www.apache.org>;
 Sun, 17 Jun 2012 15:29:23 +0000 (UTC)
Received: (qmail 39951 invoked by uid 500); 17 Jun 2012 15:29:22 -0000
Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org
Received: (qmail 39919 invoked by uid 500); 17 Jun 2012 15:29:22 -0000
Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@couchdb.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@couchdb.apache.org>
List-Post: <mailto:dev@couchdb.apache.org>
List-Id: <dev.couchdb.apache.org>
Reply-To: dev@couchdb.apache.org
Delivered-To: mailing list dev@couchdb.apache.org
Received: (qmail 39911 invoked by uid 99); 17 Jun 2012 15:29:22 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Jun 2012 15:29:22 +0000
X-ASF-Spam-Status: No, hits=0.7 required=5.0
	tests=SPF_NEUTRAL
X-Spam-Check-By: apache.org
Received-SPF: neutral (athena.apache.org: local policy)
Received: from [80.244.253.218] (HELO mail.traeumt.net) (80.244.253.218)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Jun 2012 15:29:15 +0000
Received: from [10.0.0.62] (chello084112019176.2.11.vie.surfer.at
 [84.112.19.176])
	(using TLSv1 with cipher AES128-SHA (128/128 bits))
	(No client certificate requested)
	by mail.traeumt.net (Postfix) with ESMTPSA id AE327141E0
	for <dev@couchdb.apache.org>; Sun, 17 Jun 2012 17:31:08 +0200 (CEST)
Content-Type: text/plain; charset=iso-8859-1
Mime-Version: 1.0 (Apple Message framework v1278)
Subject: Re: [PROPOSAL] Official roadmap, and merge procedure
From: Jan Lehnardt <jan@apache.org>
In-Reply-To: 
 <CA+Y+4453Y9qUcRVh17iaPfjU2G5AHCFC-5AFb4OEwpvVvO-MQw@mail.gmail.com>
Date: Sun, 17 Jun 2012 17:28:52 +0200
Content-Transfer-Encoding: quoted-printable
Message-Id: <15DD6B3E-E4B2-4202-A328-D574529164FE@apache.org>
References: 
 <CA+Y+4453Y9qUcRVh17iaPfjU2G5AHCFC-5AFb4OEwpvVvO-MQw@mail.gmail.com>
To: dev@couchdb.apache.org
X-Mailer: Apple Mail (2.1278)
X-Virus-Checked: Checked by ClamAV on apache.org


On Jun 16, 2012, at 18:45 , Noah Slater wrote:

> Devs,
>=20
> A few of us met in Dublin recently, and we discussed the project =
roadmap.
>=20
> Key takeaways from that meeting:
>=20
> 1. We'd like to proposed formal time-based releases
>=20
>=20
> 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.
>=20
>=20
> Details of these proposals can be found here:
>=20
> http://wiki.apache.org/couchdb/Roadmap_Process
>=20
>=20
> http://wiki.apache.org/couchdb/Merge_Procedure
>=20
>=20
> Please reply back to this thread with your comments on the proposals.
>=20
> (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
--=20