Return-Path: X-Original-To: apmail-incubator-flex-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-flex-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ECFE4D99C for ; Tue, 14 Aug 2012 19:38:55 +0000 (UTC) Received: (qmail 73742 invoked by uid 500); 14 Aug 2012 19:38:55 -0000 Delivered-To: apmail-incubator-flex-dev-archive@incubator.apache.org Received: (qmail 73704 invoked by uid 500); 14 Aug 2012 19:38:55 -0000 Mailing-List: contact flex-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: flex-dev@incubator.apache.org Delivered-To: mailing list flex-dev@incubator.apache.org Received: (qmail 73696 invoked by uid 99); 14 Aug 2012 19:38:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Aug 2012 19:38:55 +0000 X-ASF-Spam-Status: No, hits=1.7 required=5.0 tests=FREEMAIL_ENVFROM_END_DIGIT,HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of omuppi1@gmail.com designates 209.85.217.175 as permitted sender) Received: from [209.85.217.175] (HELO mail-lb0-f175.google.com) (209.85.217.175) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Aug 2012 19:38:47 +0000 Received: by lban1 with SMTP id n1so426078lba.6 for ; Tue, 14 Aug 2012 12:38:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:content-type; bh=UcYjP7VL1jaAIvl9VQA0qOn7tr9t10ZRMA1UZF6z5Bg=; b=nbKCp7eg/MKmmhfzHaM58ltVPy9M2NX4YP4ZGGwQRsqAjurQzSix1lNzSNGfGvm3sP Ve7rruAmnV6dmzD6BhJUSUizTU9p/8lRxzXXHVs20p7oVgwrGFNsb8dPrbRNIAOZeG9e 5oYpeLA+oLj1HDRGyhRGsAM0zomOlW83ekK6JosM5KPpL7v44G60NKUUe0VzyabyDZwg A+S9Jsu1cEgVfsqFI/yw7AjWr1hdy6c+dfFxxYsEmBhwC+EDPLU0B+xDgWAHFjpnML0t GAAc/OD+UOqezyk89vvDH8aqgMhYPMbvTJksPt1D0p4NXUMJJZc8h+UBxC08DZgmAPhW ejfg== Received: by 10.152.102.234 with SMTP id fr10mr13670664lab.32.1344973106978; Tue, 14 Aug 2012 12:38:26 -0700 (PDT) MIME-Version: 1.0 Sender: omuppi1@gmail.com Received: by 10.112.81.74 with HTTP; Tue, 14 Aug 2012 12:37:56 -0700 (PDT) In-Reply-To: References: From: Om Date: Tue, 14 Aug 2012 12:37:56 -0700 X-Google-Sender-Auth: -ZplotklPSviTL9EUJC8_YMzq6A Message-ID: Subject: Re: Discuss: Branching Strategy and SCM To: flex-dev@incubator.apache.org Content-Type: multipart/alternative; boundary=f46d04071259461fe604c73ef43f --f46d04071259461fe604c73ef43f Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable > > Alex but couldn't we simply make "[VOTE]/[DISCUSS] - [MERGE]" mandatory > > once we want to merge something to Develop branch? > > > > Jo=E3o Fernandes > Yes, but in order to vote, I have to get your branch and build it and tes= t > it in order to vote. 40 committers, 40 branches at minimum. I'd be > interested in hearing from the mentors how they "promote" stuff from bran= ch > to trunk. I was hoping it would be easier: Instead of a vote, you just > check it into "develop" and we veto if we don't like it. Then fewer folk= s > have to go look at it. But that means it might not be quite ready to go = to > production and need to be filtered out before release if we can't get it = to > production quality in time. > > It should be up to a committer to decide when a feature should go from a feature branch to develop. We should be able to trust a committer's judgement for such things. It will be up to the release manager + discussion on the mailing list to accept what is in develop to cut into a release branch. Om --f46d04071259461fe604c73ef43f--