camel-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Willem Jiang <willem.ji...@gmail.com>
Subject Re: Apache Camel 2.8 branch - merge tracking - starting rev issue?
Date Mon, 08 Aug 2011 14:00:06 GMT
Hi Claus,

The 2.8.x branch is created from trunk with the revision 1151940 with 
svnmerge.py init according to this commit log.

Author: hadrian
Date: Thu Jul 28 17:52:21 2011
New Revision: 1151941

URL: http://svn.apache.org/viewvc?rev=1151941&view=rev
Log:
Creating camel-2.8.x fixes branch

Added:
     camel/branches/camel-2.8.x/
       - copied from r1151940, camel/tags/camel-2.8.0/

But I think we should copy the branch from “camel/trunk” instead of 
“camel/tags/camel-2.8.0”.

I just updated svn properties to 1148091 which camel-2.8.0 release 
version, and merged the patch of 1149488 into the camel-2.8.x branch.


On 8/8/11 7:59 PM, Claus Ibsen wrote:
> Hi
>
> I can see Willem added the svnmerge.py tracing on the 2.8 branch.
>
> He started from rev: 1151940
> Willem do you know the reason for that rev number?
>
> As I got a fix post 2.8.0 release in rev 1149488 that I would like to merge.
> But that is not possible since 1149488 is<  than 1151940
>
> Its this ticket
> https://issues.apache.org/jira/browse/CAMEL-4261
>
>
> Maybe 1151940 was a mistake and it should have been a lower number?
>


-- 
Willem
----------------------------------
FuseSource
Web: http://www.fusesource.com
Blog:    http://willemjiang.blogspot.com (English)
          http://jnn.javaeye.com (Chinese)
Twitter: willemjiang
Weibo: willemjiang

Mime
View raw message