Return-Path: Delivered-To: apmail-geronimo-dev-archive@www.apache.org Received: (qmail 68679 invoked from network); 8 Jun 2006 01:01:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Jun 2006 01:01:29 -0000 Received: (qmail 45845 invoked by uid 500); 8 Jun 2006 01:01:25 -0000 Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org Received: (qmail 45794 invoked by uid 500); 8 Jun 2006 01:01:25 -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 45783 invoked by uid 99); 8 Jun 2006 01:01:25 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jun 2006 18:01:25 -0700 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [199.237.51.194] (HELO green.rootmode.com) (199.237.51.194) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jun 2006 18:01:23 -0700 X-ClientAddr: 68.171.62.46 Received: from [192.168.15.104] (68-171-62-46.vnnyca.adelphia.net [68.171.62.46]) by green.rootmode.com (8.12.10/8.12.10) with ESMTP id k5810mEe015140 for ; Wed, 7 Jun 2006 21:00:49 -0400 Mime-Version: 1.0 (Apple Message framework v750) In-Reply-To: <74e15baa0606071738y302e2565m42d0c39513d8e200@mail.gmail.com> References: <74e15baa0606071738y302e2565m42d0c39513d8e200@mail.gmail.com> Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: Content-Transfer-Encoding: 7bit From: Dain Sundstrom Subject: Re: [RTC] move geronimo/site to a trunk & branch Date: Wed, 7 Jun 2006 18:00:49 -0700 To: dev@geronimo.apache.org X-Mailer: Apple Mail (2.750) X-RootMode-MailScanner-Information: Please contact the ISP for more information X-RootMode-MailScanner: Found to be clean X-MailScanner-From: dain@iq80.com X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Good idea +1 -dain On Jun 7, 2006, at 5:38 PM, Aaron Mulder wrote: > Currently, the code checked in to the geronimo/site repo does not (and > should not) correspond to our live web site. My understanding is that > Hernan has a newer revision that he has not checked in (but it can be > seen at http://people.apache.org/~hcunico/newsite/) > > I want to update the news and events on the current site to move the > expired events, add some 1.1 information, etc. I want to do that to > the site as it exists on geronimo.apache.org site today, until we're > in agreement about what it should look like next. Currently I can't > do that unless I edit the HTML on minotaur directly and lose any > Subversion history (I believe the content on minotaur is as of > just-before-rev-411192). > > I propose we: > - move geronimo/site to geronimo/site/branches/may2006 > - copy geronimo/site revision 411191 to geronimo/site/trunk > - update the site sync script on minotaur to pull from geronimo/ > site/trunk > > Then Hernan can check his pending changes into the new branch and I > can check my news and event updates into both the branch and trunk and > sync minotaur from trunk. When we're all agreed that the branch > content is what we want, we can either merge it to trunk or move trunk > away and move the branch to be the new trunk. > > I'm taking the slightly unusual step of not attaching a patch since I > think the description above is much more meaningful than the > equivalent tremendously large patch. Here's my +1, can I get 3 more? > > Thanks, > Aaron