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 CDA1DD3A6 for ; Tue, 7 Aug 2012 23:32:57 +0000 (UTC) Received: (qmail 19449 invoked by uid 500); 7 Aug 2012 23:32:57 -0000 Delivered-To: apmail-incubator-flex-dev-archive@incubator.apache.org Received: (qmail 19415 invoked by uid 500); 7 Aug 2012 23:32:57 -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 19405 invoked by uid 99); 7 Aug 2012 23:32:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Aug 2012 23:32:56 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of justinmclean@gmail.com designates 209.85.160.47 as permitted sender) Received: from [209.85.160.47] (HELO mail-pb0-f47.google.com) (209.85.160.47) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Aug 2012 23:32:49 +0000 Received: by pbcwy7 with SMTP id wy7so393262pbc.6 for ; Tue, 07 Aug 2012 16:32:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:content-type:mime-version:subject:from:in-reply-to:date :content-transfer-encoding:message-id:references:to:x-mailer; bh=6/CeWUwWPFe08Ly/TUs3f+4Q2v+v/xiaDtQEZjChciE=; b=UKiEjf+2Vn+BzlUWiWMoNxfvWSae4KpNp4Jiy+iCSIYNPBmFsJP0ucvEgafbNop0Ik T3x1edNn+nE3c9G4PB5thxZE7TT0VisY8k2ddX6KyXL5LvDWZ6cNuI8aZ90m3vHZHo+s Xpr04Ea887BeHVQvaasOjSzIyl86n5q6IFENeMXvwdOmeVRqIBzYRWkbZplu7aZX5dGt MraeSh6bakgG8+/nMLDFV4dLfyCrQFxQjvXlDmrcyjiDj6J+T75ghBGGXm2bpvhYkfHu tvvHXxyQ2XwSVq/aUye1DySsk9/6KXRM0qQXCla2GrW8bGoxOVjxkZQly1QZVMR+W4B8 AGYw== Received: by 10.68.217.233 with SMTP id pb9mr31384977pbc.140.1344382348912; Tue, 07 Aug 2012 16:32:28 -0700 (PDT) Received: from [192.168.0.9] (124-149-46-91.dyn.iinet.net.au. [124.149.46.91]) by mx.google.com with ESMTPS id kt2sm3624800pbc.73.2012.08.07.16.32.25 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Aug 2012 16:32:27 -0700 (PDT) Sender: Justin Mclean Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Apple Message framework v1280) Subject: Re: SVN and issues with branching / consider how we use SVN going forward From: Justin Mclean In-Reply-To: Date: Wed, 8 Aug 2012 09:32:22 +1000 Content-Transfer-Encoding: quoted-printable Message-Id: <259B0C54-AC53-4E27-9876-BECF2CBC7C76@classsoftware.com> References: To: flex-dev@incubator.apache.org X-Mailer: Apple Mail (2.1280) X-Virus-Checked: Checked by ClamAV on apache.org Hi, > Unfortunately, Flex isn't as modular as it should be. Perhaps not on the large scale architecture level. But I still see no = issue with checking fixes to JIRA issues or new components (tested = obviously) into trunk as they would be small bite sized chunks (and = generally low risk), even changes to existing components should be able = to be done in bite size chunks, for major architecture changes I would = expect a branch. > And given that I don't think we have enough tests to keep trunk in = good shape How many Mustella tests just got checked in? 10,000? As all development = is in public you get many people eyes on each check in. Changes to trunk = can be very easily reverted if needed. > I'd lean towards playing it safe with an unstable branch until we can = prove that we can keep it in shape. Let say we go with this. At any one time you may have several people = patches etc in unstable and if it's decided that one is good enough to = put into trunk how do you merge that patch into trunk and not the other = patches? Even if the patches are in different parts of the code I can = see issues here. How do we know when the unstable branch isn't broken? = Do we need to set up more CI instances one for unstable and another for = any other long running branch? Do we need to run Mustella over both = trunk and unstable before doing a merge? Justin