Return-Path: X-Original-To: apmail-ant-dev-archive@www.apache.org Delivered-To: apmail-ant-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 4C24B9C7C for ; Fri, 16 Mar 2012 15:09:55 +0000 (UTC) Received: (qmail 77853 invoked by uid 500); 16 Mar 2012 15:09:55 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 77784 invoked by uid 500); 16 Mar 2012 15:09:54 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 77774 invoked by uid 99); 16 Mar 2012 15:09:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Mar 2012 15:09:54 +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 (nike.apache.org: domain of gudnabrsam@gmail.com designates 209.85.210.45 as permitted sender) Received: from [209.85.210.45] (HELO mail-pz0-f45.google.com) (209.85.210.45) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Mar 2012 15:09:47 +0000 Received: by dadp14 with SMTP id p14so6397955dad.4 for ; Fri, 16 Mar 2012 08:09:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:in-reply-to:references:date:message-id :subject:from:to:content-type:content-transfer-encoding; bh=mYmF2hbk4eWF9CcpsrvnZKq7sTnMlNfEzFAKApS8Cgc=; b=HZLPzU78RYDL5Rfw8GP5YkzMBBw3235VcpJ8A3mho2j6bCt3VFbdulLegUEHTxwrSs skuZHKBFBF1Tf3ED8kKtdpELUQBY2+4b7O6jF39+iWkh8ROXfykAOsx0Kl0JnvHeAqSh YD7jA3Ogd/Wyh2gHZOJDweQag3B/qt1nMMdiPmRFRaBQHnhkq5yQKpqvuH3OyfqyHzjl oaNXZluZApga9WW3xAXFPKwxVPLfX/7JZ9WH5URNU8ynsMVAg0r6lxNPrlWIP/f6YyV0 V+YDzxLITo/eUAVbsdFIJxOvFvHLuNVqVVkfvXqgyqL8VJcDrDEgb4hIHMxwYdexuV1K HJHQ== MIME-Version: 1.0 Received: by 10.68.134.133 with SMTP id pk5mr12233231pbb.166.1331910565771; Fri, 16 Mar 2012 08:09:25 -0700 (PDT) Received: by 10.68.74.129 with HTTP; Fri, 16 Mar 2012 08:09:25 -0700 (PDT) Reply-To: gudnabrsam@gmail.com In-Reply-To: <87d38ddtvx.fsf@v35516.1blu.de> References: <87d38ddtvx.fsf@v35516.1blu.de> Date: Fri, 16 Mar 2012 10:09:25 -0500 Message-ID: Subject: Re: Merging to the 1.8.x branch From: Matt Benson To: Ant Developers List Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org On Thu, Mar 15, 2012 at 11:58 PM, Stefan Bodewig wrote= : > Hi, > > WRT merging to the branch we basically have two options: (1) merge when > we commit to trunk or (2) merge when we know we want to create another > 1.8.x release. > > I'm leaning towards (2) since I personally don't expect a 1.8.4 > release. =A0But just in case I've created a wiki page at > listing the > changesets that could be merged easily and would be important enough to > go into the next release. =A0I haven't found the time to review Jesse's > commits of the past two weeks, yet. > > Is this a dumb idea? =A0Should we merge stuff right away? Option 2 sounds fine to me. Matt > > Stefan > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org > For additional commands, e-mail: dev-help@ant.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org