From continuum-dev-return-6689-apmail-maven-continuum-dev-archive=maven.apache.org@maven.apache.org Thu Feb 28 22:56:39 2008 Return-Path: Delivered-To: apmail-maven-continuum-dev-archive@www.apache.org Received: (qmail 91931 invoked from network); 28 Feb 2008 22:56:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Feb 2008 22:56:38 -0000 Received: (qmail 89868 invoked by uid 500); 28 Feb 2008 22:56:33 -0000 Delivered-To: apmail-maven-continuum-dev-archive@maven.apache.org Received: (qmail 89842 invoked by uid 500); 28 Feb 2008 22:56:33 -0000 Mailing-List: contact continuum-dev-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-dev@maven.apache.org Received: (qmail 89831 invoked by uid 99); 28 Feb 2008 22:56:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Feb 2008 14:56:33 -0800 X-ASF-Spam-Status: No, hits=1.2 required=10.0 tests=SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [210.50.30.235] (HELO mx05.syd.iprimus.net.au) (210.50.30.235) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Feb 2008 22:55:44 +0000 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgAAAFbKxkc6sjc3/2dsb2JhbAAIrlo X-IronPort-AV: E=Sophos;i="4.25,422,1199624400"; d="scan'208";a="98310787" Received: from 55.127.dsl.syd.iprimus.net.au (HELO [192.168.237.168]) ([58.178.55.55]) by smtp05.syd.iprimus.net.au with ESMTP; 29 Feb 2008 09:56:01 +1100 Message-Id: From: Brett Porter To: continuum-dev@maven.apache.org In-Reply-To: Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v919.2) Subject: Re: Confused about the branches Date: Fri, 29 Feb 2008 09:55:55 +1100 References: <4721EE6A-7703-434B-BAEE-F38C9C403BE6@apache.org> X-Mailer: Apple Mail (2.919.2) X-Virus-Checked: Checked by ClamAV on apache.org On 29/02/2008, at 9:52 AM, Emmanuel Venisse wrote: > why 1.1.x? in case there was a bugfix release on 1.1? I thought that was what the branch was for... maintenance of 1.1. or is there going to be 2 completely different strands of development? - Brett > > > On Thu, Feb 28, 2008 at 11:45 PM, Brett Porter > wrote: > >> Hi, >> >> I'm a bit confused about the current branch scenarios, we have 1.2 on >> a branch and 2.0 on trunk. Several changes have been made on each, >> and >> none merged to the other. >> >> Can I suggest we merge all branch changes to trunk, rename trunk to >> 1.2-SNAPSHOT, and the branch to continuum-1.1.x (1.1.1-SNAPSHOT) and >> use that for bugfixes only? >> >> WDYT? >> >> - Brett >> >> -- >> Brett Porter >> brett@apache.org >> http://blogs.exist.com/bporter/ >> >> -- Brett Porter brett@apache.org http://blogs.exist.com/bporter/