Return-Path: Delivered-To: apmail-geronimo-dev-archive@www.apache.org Received: (qmail 69505 invoked from network); 15 Jun 2006 18:08:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Jun 2006 18:08:53 -0000 Received: (qmail 64535 invoked by uid 500); 15 Jun 2006 18:08:00 -0000 Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org Received: (qmail 64493 invoked by uid 500); 15 Jun 2006 18:08:00 -0000 Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list dev@geronimo.apache.org Received: (qmail 64482 invoked by uid 99); 15 Jun 2006 18:08:00 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Jun 2006 11:08:00 -0700 X-ASF-Spam-Status: No, hits=0.3 required=10.0 tests=MANY_EXCLAMATIONS,PLING_QUERY X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [72.10.46.63] (HELO as.toolazydogs.com) (72.10.46.63) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Jun 2006 11:07:59 -0700 Received: (qmail 32328 invoked from network); 15 Jun 2006 11:07:27 -0700 Received: from c-24-7-76-123.hsd1.ca.comcast.net (HELO ?192.168.226.55?) (24.7.76.123) by toolazydogs.com with SMTP; 15 Jun 2006 11:07:27 -0700 Message-ID: <4491A208.2020609@toolazydogs.com> Date: Thu, 15 Jun 2006 11:08:08 -0700 From: "Alan D. Cabrera" User-Agent: Thunderbird 1.5.0.4 (Macintosh/20060530) MIME-Version: 1.0 To: dev@geronimo.apache.org Subject: Re: Where did the 1.1 branch go?!?! References: <74e15baa0606150827j6196a402we1da1711e48f6dee@mail.gmail.com> <44917EB1.9010604@joyfulnoisewebdesign.com> <74e15baa0606150840m7e9ccd67u80973c36c9729a51@mail.gmail.com> <82686663-C980-4781-B0A4-54F94874672F@visi.com> <74e15baa0606150936r3a4520ffmd8c8385419b251f0@mail.gmail.com> In-Reply-To: <74e15baa0606150936r3a4520ffmd8c8385419b251f0@mail.gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Aaron Mulder wrote: > On 6/15/06, David Blevins wrote: >> Exactly that, to make sure people don't "move on" and checkin work on >> branches/1.1 for 1.1.1 where there is a freeze on branches/1.1 for >> preparing v1.1 (which may not pass it's vote and have to be redone). > > OK, so let's say our state today is branches/1.1 and we're about to > cut 1.1.0. > > branches/1.1 > > In order to prepare the release, you copy branches/1.1 to tags/1.1.0 > and then (if I understand you right) move branches/1.1 to > branches/1.1.1: > > branches/1.1.1 > tags/1.1.0 > > Now you discover that the tag was bad, but code has been checked in to > branches/1.1.1. What do you do? > > I don't think this has any advantage over leaving branches/1.1 and > copying it to tags/1.1.0: > > branches/1.1 > tags/1.1.0 > > Either way, if the build is bad, you'll have to copy tags/1.1 to > somewhere else to work on it (branches/1.1.0??) until you're ready to > cut another build. > > It might be better to just suck it up and cut branches/1.1.0 at the > time of the freeze, and then tags/1.1.0 from that when you want to > create a candidate: > > branches/1.1 (now 1.1.1-SNAPSHOT) > branches/1.1.0 (frozen, copied from branches/1.1 at freeze time, only > super-critical changes) > tags/1.1.0 (candidate release, copy from branches/1.1.0) > > Then if the tag is bad, whack it, fix up branches/1.1.0, and recopy > tags/1.1.0 I want to point out that this is quite odd, keeping a 1.1.0 branches for patches for a release that hasn't been released yet. I haven't caught up with the release versioning discussions yet. Regards, Alan