Mailing-List: contact camel-dev-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: camel-dev@activemq.apache.org
Received-SPF: pass (athena.apache.org: domain of james.strachan@gmail.com
 designates 209.85.217.10 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=message-id:date:from:to:subject:in-reply-to:mime-version
         :content-type:content-transfer-encoding:content-disposition
         :references;
        b=Dk5kHCNLfZ9ctVaOcwnNH9+RTzFTYHpQrOx3LTTOomgzFyU2t8S/3UnHMt5muIPXKr
         +EB2FicHoabI3mNy+0kjDZtWOj1wJlt10fKd3G/wjd+NyWb+Xkzu654Ny0aiVXtw4O+M
         CG9ZHAsf0N/p87K6vIhhUkSINAa7rY7n7lzMQ=
Message-ID: <ec6e67fd0810290708n4c18b055v6dbf5c3831200327@mail.gmail.com>
Date: Wed, 29 Oct 2008 14:08:11 +0000
From: "James Strachan" <james.strachan@gmail.com>
To: camel-dev@activemq.apache.org, janstey@gmail.com
Subject: Re: Branch for 1.5
In-Reply-To: <49086D2A.8030800@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <49086962.5040405@gmail.com>
	 <c52c8a780810290654g2b2ccba9g53b54c35dd0d0d69@mail.gmail.com>
	 <ec6e67fd0810290658j459cabf6xf59beb61ee22bd42@mail.gmail.com>
	 <49086D2A.8030800@gmail.com>

I guess we only need 1 branch though, however many releases we end up
doing from the 1.x branch

2008/10/29 Jonathan Anstey <janstey@gmail.com>:
> Yeah, if we put out the next 1.x release as 1.6, 1.7, 1.8, etc. I'd be fine
> with that.  I think I was just trying to minimize the number of possible 1.x
> releases we could put out. For example, I didn't want this to occur: Camel
> 1.5.1, 1.5.2, 1.5.3, 1.6.0, 1.6.1, etc etc etc etc :)
>
> James Strachan wrote:
>>
>> Am liking 1.x for the same reasons as Willem now :)
>>
>> 2008/10/29 Willem Jiang <willem.jiang@gmail.com>:
>>
>>>
>>> I perfer to use camel-1.x , since we could release camel 1.5.x or camel
>>> 1.6
>>> from this branch.
>>> If we don't want to release camel 1.6 or camel 1.7, we could use
>>> camel-1.5
>>> as the branch name.
>>>
>>> Just my two cents.
>>>
>>> Willem/
>>>
>>> On Wed, Oct 29, 2008 at 9:47 PM, Jonathan Anstey <janstey@gmail.com>
>>> wrote:
>>>
>>>
>>>>
>>>> Now that the 1.5 release is pretty much complete I'm thinking of setting
>>>> up
>>>> a branch so we can start hacking on 2.0 stuff more freely. I guess there
>>>> are
>>>> several options on names
>>>>
>>>> http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.5
>>>> http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.5.x
>>>> http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.x
>>>>
>>>> I prefer camel-1.5 since it follows ActiveMQ's branching convention -
>>>> does
>>>> anybody else have a preference?
>>>>
>>>> I'm also going to set up http://www.orcaware.com/svn/wiki/Svnmerge.py on
>>>> that branch so we can have nice merge tracking between trunk and the
>>>> branch.
>>>>
>>>> Cheers,
>>>> Jon
>>>>
>>>>
>>
>>
>>
>>
>
>


-- 
James
-------
http://macstrac.blogspot.com/

Open Source Integration
http://fusesource.com/