You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@camel.apache.org by Jonathan Anstey <ja...@gmail.com> on 2008/11/03 22:13:28 UTC
Camel 1.x branch set up
Hi all,
I've set up the Camel 1.x branch here:
http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.x
The idea is to be able to apply bug fixes to Camel 1.x while leaving new
features and other API breaking stuff on the trunk. I think in most
cases fixes will be happening on the trunk so I've set up svnmerge.py
(http://www.orcaware.com/svn/wiki/Svnmerge.py) to track commits from the
trunk to the 1.x branch.
Example workflow:
1. You just committed a fix to the trunk in revision 123456 and think
that it would be useful to Camel 1.5 users
2. svn co
http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.x camel-1.x
3. In camel-1.x directory, you can get a list of commits available from
the trunk
janstey@mojo:/x1/apache/camel-1.x$ svnmerge.py avail -l
------------------------------------------------------------------------
r123456 | janstey | 2008-11-01 01:08:18 -0230 (Sat, 01 Nov 2008) | 1 line
Changed paths:
M
/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/SomeFile.java
My awesome commit
janstey@mojo:/x1/apache/camel-1.x$
4. Merge your commit by running 'svnmerge.py merge -r 123456'
5. Resolve any conflicts in the merge
6. Commit it by running 'svn ci -F svnmerge-commit-message.txt'
7. If you have a JIRA associated with this fix, make sure it says fix
for 1.5.1 and/or 2.0.0
Now, it may seem like a bit of work at first but I think the merge
tracking will be very helpful later on. Let me know if you have any
questions or concerns on this stuff. Or better yet, if you have ideas on
how to make it better, let them be known! :)
Cheers,
Jon
Re: Camel 1.x branch set up
Posted by Jonathan Anstey <ja...@gmail.com>.
Haha good point. I guess my browser still prefers the pre-committer links :)
Willem Jiang wrote:
> Hi Jon,
>
> The Camel 1.x branch url for committer should be
> https://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.x
>
> I found it after getting the 403 error and I just update the wiki page
> for it :)
>
> Willem
>
> Jon Anstey wrote:
>
>> Added a wiki page here
>>
>> http://cwiki.apache.org/confluence/display/CAMEL/Merging+commits+from+trunk+to+fixes+branch
>>
>> On Tue, Nov 4, 2008 at 9:16 AM, Jon Anstey <ja...@gmail.com> wrote:
>>
>>
>>> Cool, glad you like it. I left one of your commits in the list yesterday so
>>> you could not resist trying it out ;)
>>>
>>> I'll add it to the wiki shortly.
>>>
>>>
>>> On Tue, Nov 4, 2008 at 4:09 AM, Claus Ibsen <ci...@silverbullet.dk> wrote:
>>>
>>>
>>>> Hi Jonathan
>>>>
>>>> This is fantastic. Works great, even on my poor laptop that runs XP.
>>>> Just merged the FTP passive mode that I wanted to backport manually, but
>>>> this comes to the rescure.
>>>>
>>>> Could you add your instructions as a wiki page to the camel documentations
>>>> under the developer guide section?
>>>>
>>>>
>>>> Med venlig hilsen
>>>>
>>>> Claus Ibsen
>>>> ......................................
>>>> Silverbullet
>>>> Skovsgårdsvænget 21
>>>> 8362 Hørning
>>>> Tlf. +45 2962 7576
>>>> Web: www.silverbullet.dk
>>>> -----Original Message-----
>>>> From: Jonathan Anstey [mailto:janstey@gmail.com]
>>>> Sent: 3. november 2008 22:13
>>>> To: camel-dev@activemq.apache.org
>>>> Subject: Camel 1.x branch set up
>>>>
>>>> Hi all,
>>>>
>>>> I've set up the Camel 1.x branch here:
>>>>
>>>> http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.x
>>>>
>>>> The idea is to be able to apply bug fixes to Camel 1.x while leaving new
>>>> features and other API breaking stuff on the trunk. I think in most
>>>> cases fixes will be happening on the trunk so I've set up svnmerge.py
>>>> (http://www.orcaware.com/svn/wiki/Svnmerge.py) to track commits from the
>>>> trunk to the 1.x branch.
>>>>
>>>> Example workflow:
>>>>
>>>> 1. You just committed a fix to the trunk in revision 123456 and think
>>>> that it would be useful to Camel 1.5 users
>>>>
>>>> 2. svn co
>>>> http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.xcamel-1.x
>>>>
>>>> 3. In camel-1.x directory, you can get a list of commits available from
>>>> the trunk
>>>>
>>>> janstey@mojo:/x1/apache/camel-1.x$ svnmerge.py avail -l
>>>> ------------------------------------------------------------------------
>>>> r123456 | janstey | 2008-11-01 01:08:18 -0230 (Sat, 01 Nov 2008) | 1 line
>>>> Changed paths:
>>>> M
>>>>
>>>> /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/SomeFile.java
>>>>
>>>> My awesome commit
>>>> janstey@mojo:/x1/apache/camel-1.x$
>>>>
>>>> 4. Merge your commit by running 'svnmerge.py merge -r 123456'
>>>>
>>>> 5. Resolve any conflicts in the merge
>>>>
>>>> 6. Commit it by running 'svn ci -F svnmerge-commit-message.txt'
>>>>
>>>> 7. If you have a JIRA associated with this fix, make sure it says fix
>>>> for 1.5.1 and/or 2.0.0
>>>>
>>>>
>>>> Now, it may seem like a bit of work at first but I think the merge
>>>> tracking will be very helpful later on. Let me know if you have any
>>>> questions or concerns on this stuff. Or better yet, if you have ideas on
>>>> how to make it better, let them be known! :)
>>>>
>>>> Cheers,
>>>> Jon
>>>>
>>>>
>>>>
>>> --
>>> Cheers,
>>> Jon
>>>
>>> http://janstey.blogspot.com/
>>>
>>>
>>
>>
>
>
Re: Camel 1.x branch set up
Posted by Willem Jiang <wi...@gmail.com>.
Hi Jon,
The Camel 1.x branch url for committer should be
https://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.x
I found it after getting the 403 error and I just update the wiki page
for it :)
Willem
Jon Anstey wrote:
> Added a wiki page here
>
> http://cwiki.apache.org/confluence/display/CAMEL/Merging+commits+from+trunk+to+fixes+branch
>
> On Tue, Nov 4, 2008 at 9:16 AM, Jon Anstey <ja...@gmail.com> wrote:
>
>> Cool, glad you like it. I left one of your commits in the list yesterday so
>> you could not resist trying it out ;)
>>
>> I'll add it to the wiki shortly.
>>
>>
>> On Tue, Nov 4, 2008 at 4:09 AM, Claus Ibsen <ci...@silverbullet.dk> wrote:
>>
>>> Hi Jonathan
>>>
>>> This is fantastic. Works great, even on my poor laptop that runs XP.
>>> Just merged the FTP passive mode that I wanted to backport manually, but
>>> this comes to the rescure.
>>>
>>> Could you add your instructions as a wiki page to the camel documentations
>>> under the developer guide section?
>>>
>>>
>>> Med venlig hilsen
>>>
>>> Claus Ibsen
>>> ......................................
>>> Silverbullet
>>> Skovsgårdsvænget 21
>>> 8362 Hørning
>>> Tlf. +45 2962 7576
>>> Web: www.silverbullet.dk
>>> -----Original Message-----
>>> From: Jonathan Anstey [mailto:janstey@gmail.com]
>>> Sent: 3. november 2008 22:13
>>> To: camel-dev@activemq.apache.org
>>> Subject: Camel 1.x branch set up
>>>
>>> Hi all,
>>>
>>> I've set up the Camel 1.x branch here:
>>>
>>> http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.x
>>>
>>> The idea is to be able to apply bug fixes to Camel 1.x while leaving new
>>> features and other API breaking stuff on the trunk. I think in most
>>> cases fixes will be happening on the trunk so I've set up svnmerge.py
>>> (http://www.orcaware.com/svn/wiki/Svnmerge.py) to track commits from the
>>> trunk to the 1.x branch.
>>>
>>> Example workflow:
>>>
>>> 1. You just committed a fix to the trunk in revision 123456 and think
>>> that it would be useful to Camel 1.5 users
>>>
>>> 2. svn co
>>> http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.xcamel-1.x
>>>
>>> 3. In camel-1.x directory, you can get a list of commits available from
>>> the trunk
>>>
>>> janstey@mojo:/x1/apache/camel-1.x$ svnmerge.py avail -l
>>> ------------------------------------------------------------------------
>>> r123456 | janstey | 2008-11-01 01:08:18 -0230 (Sat, 01 Nov 2008) | 1 line
>>> Changed paths:
>>> M
>>>
>>> /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/SomeFile.java
>>>
>>> My awesome commit
>>> janstey@mojo:/x1/apache/camel-1.x$
>>>
>>> 4. Merge your commit by running 'svnmerge.py merge -r 123456'
>>>
>>> 5. Resolve any conflicts in the merge
>>>
>>> 6. Commit it by running 'svn ci -F svnmerge-commit-message.txt'
>>>
>>> 7. If you have a JIRA associated with this fix, make sure it says fix
>>> for 1.5.1 and/or 2.0.0
>>>
>>>
>>> Now, it may seem like a bit of work at first but I think the merge
>>> tracking will be very helpful later on. Let me know if you have any
>>> questions or concerns on this stuff. Or better yet, if you have ideas on
>>> how to make it better, let them be known! :)
>>>
>>> Cheers,
>>> Jon
>>>
>>>
>>
>> --
>> Cheers,
>> Jon
>>
>> http://janstey.blogspot.com/
>>
>
>
>
Re: Camel 1.x branch set up
Posted by Jon Anstey <ja...@gmail.com>.
Well, thats a good point. I guess svnmerge.py is what I've been using for
over two years now without a hitch so I know its just going to work. Another
reason would be that I'm using svn 1.4.6 so I didn't think about using the
1.5 merge stuff :)
On Wed, Nov 5, 2008 at 5:20 AM, Martin Gilday <ma...@imap.cc> wrote:
> What are the reasons for using svnmerge.py over the new merging features
> of Subversion 1.5 (which the repo seems to be using)?
>
>
> ----- Original message -----
> From: "Jon Anstey" <ja...@gmail.com>
> To: camel-dev@activemq.apache.org
> Date: Tue, 4 Nov 2008 09:35:34 -0330
> Subject: Re: Camel 1.x branch set up
>
> Added a wiki page here
>
>
> http://cwiki.apache.org/confluence/display/CAMEL/Merging+commits+from+trunk+to+fixes+branch
>
> On Tue, Nov 4, 2008 at 9:16 AM, Jon Anstey <ja...@gmail.com> wrote:
>
> > Cool, glad you like it. I left one of your commits in the list yesterday
> so
> > you could not resist trying it out ;)
> >
> > I'll add it to the wiki shortly.
> >
> >
> > On Tue, Nov 4, 2008 at 4:09 AM, Claus Ibsen <ci...@silverbullet.dk> wrote:
> >
> >> Hi Jonathan
> >>
> >> This is fantastic. Works great, even on my poor laptop that runs XP.
> >> Just merged the FTP passive mode that I wanted to backport manually, but
> >> this comes to the rescure.
> >>
> >> Could you add your instructions as a wiki page to the camel
> documentations
> >> under the developer guide section?
> >>
> >>
> >> Med venlig hilsen
> >>
> >> Claus Ibsen
> >> ......................................
> >> Silverbullet
> >> Skovsgårdsvænget 21
> >> 8362 Hørning
> >> Tlf. +45 2962 7576
> >> Web: www.silverbullet.dk
> >> -----Original Message-----
> >> From: Jonathan Anstey [mailto:janstey@gmail.com]
> >> Sent: 3. november 2008 22:13
> >> To: camel-dev@activemq.apache.org
> >> Subject: Camel 1.x branch set up
> >>
> >> Hi all,
> >>
> >> I've set up the Camel 1.x branch here:
> >>
> >> http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.x
> >>
> >> The idea is to be able to apply bug fixes to Camel 1.x while leaving new
> >> features and other API breaking stuff on the trunk. I think in most
> >> cases fixes will be happening on the trunk so I've set up svnmerge.py
> >> (http://www.orcaware.com/svn/wiki/Svnmerge.py) to track commits from
> the
> >> trunk to the 1.x branch.
> >>
> >> Example workflow:
> >>
> >> 1. You just committed a fix to the trunk in revision 123456 and think
> >> that it would be useful to Camel 1.5 users
> >>
> >> 2. svn co
> >>
> http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.xcamel-1.x
> >>
> >> 3. In camel-1.x directory, you can get a list of commits available from
> >> the trunk
> >>
> >> janstey@mojo:/x1/apache/camel-1.x$ svnmerge.py avail -l
> >> ------------------------------------------------------------------------
> >> r123456 | janstey | 2008-11-01 01:08:18 -0230 (Sat, 01 Nov 2008) | 1
> line
> >> Changed paths:
> >> M
> >>
> >>
> /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/SomeFile.java
> >>
> >> My awesome commit
> >> janstey@mojo:/x1/apache/camel-1.x$
> >>
> >> 4. Merge your commit by running 'svnmerge.py merge -r 123456'
> >>
> >> 5. Resolve any conflicts in the merge
> >>
> >> 6. Commit it by running 'svn ci -F svnmerge-commit-message.txt'
> >>
> >> 7. If you have a JIRA associated with this fix, make sure it says fix
> >> for 1.5.1 and/or 2.0.0
> >>
> >>
> >> Now, it may seem like a bit of work at first but I think the merge
> >> tracking will be very helpful later on. Let me know if you have any
> >> questions or concerns on this stuff. Or better yet, if you have ideas on
> >> how to make it better, let them be known! :)
> >>
> >> Cheers,
> >> Jon
> >>
> >>
> >
> >
> > --
> > Cheers,
> > Jon
> >
> > http://janstey.blogspot.com/
> >
>
>
>
> --
> Cheers,
> Jon
>
> http://janstey.blogspot.com/
>
--
Cheers,
Jon
http://janstey.blogspot.com/
Re: Camel 1.x branch set up
Posted by Martin Gilday <ma...@imap.cc>.
What are the reasons for using svnmerge.py over the new merging features
of Subversion 1.5 (which the repo seems to be using)?
----- Original message -----
From: "Jon Anstey" <ja...@gmail.com>
To: camel-dev@activemq.apache.org
Date: Tue, 4 Nov 2008 09:35:34 -0330
Subject: Re: Camel 1.x branch set up
Added a wiki page here
http://cwiki.apache.org/confluence/display/CAMEL/Merging+commits+from+trunk+to+fixes+branch
On Tue, Nov 4, 2008 at 9:16 AM, Jon Anstey <ja...@gmail.com> wrote:
> Cool, glad you like it. I left one of your commits in the list yesterday so
> you could not resist trying it out ;)
>
> I'll add it to the wiki shortly.
>
>
> On Tue, Nov 4, 2008 at 4:09 AM, Claus Ibsen <ci...@silverbullet.dk> wrote:
>
>> Hi Jonathan
>>
>> This is fantastic. Works great, even on my poor laptop that runs XP.
>> Just merged the FTP passive mode that I wanted to backport manually, but
>> this comes to the rescure.
>>
>> Could you add your instructions as a wiki page to the camel documentations
>> under the developer guide section?
>>
>>
>> Med venlig hilsen
>>
>> Claus Ibsen
>> ......................................
>> Silverbullet
>> Skovsgårdsvænget 21
>> 8362 Hørning
>> Tlf. +45 2962 7576
>> Web: www.silverbullet.dk
>> -----Original Message-----
>> From: Jonathan Anstey [mailto:janstey@gmail.com]
>> Sent: 3. november 2008 22:13
>> To: camel-dev@activemq.apache.org
>> Subject: Camel 1.x branch set up
>>
>> Hi all,
>>
>> I've set up the Camel 1.x branch here:
>>
>> http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.x
>>
>> The idea is to be able to apply bug fixes to Camel 1.x while leaving new
>> features and other API breaking stuff on the trunk. I think in most
>> cases fixes will be happening on the trunk so I've set up svnmerge.py
>> (http://www.orcaware.com/svn/wiki/Svnmerge.py) to track commits from the
>> trunk to the 1.x branch.
>>
>> Example workflow:
>>
>> 1. You just committed a fix to the trunk in revision 123456 and think
>> that it would be useful to Camel 1.5 users
>>
>> 2. svn co
>> http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.xcamel-1.x
>>
>> 3. In camel-1.x directory, you can get a list of commits available from
>> the trunk
>>
>> janstey@mojo:/x1/apache/camel-1.x$ svnmerge.py avail -l
>> ------------------------------------------------------------------------
>> r123456 | janstey | 2008-11-01 01:08:18 -0230 (Sat, 01 Nov 2008) | 1 line
>> Changed paths:
>> M
>>
>> /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/SomeFile.java
>>
>> My awesome commit
>> janstey@mojo:/x1/apache/camel-1.x$
>>
>> 4. Merge your commit by running 'svnmerge.py merge -r 123456'
>>
>> 5. Resolve any conflicts in the merge
>>
>> 6. Commit it by running 'svn ci -F svnmerge-commit-message.txt'
>>
>> 7. If you have a JIRA associated with this fix, make sure it says fix
>> for 1.5.1 and/or 2.0.0
>>
>>
>> Now, it may seem like a bit of work at first but I think the merge
>> tracking will be very helpful later on. Let me know if you have any
>> questions or concerns on this stuff. Or better yet, if you have ideas on
>> how to make it better, let them be known! :)
>>
>> Cheers,
>> Jon
>>
>>
>
>
> --
> Cheers,
> Jon
>
> http://janstey.blogspot.com/
>
--
Cheers,
Jon
http://janstey.blogspot.com/
Re: Camel 1.x branch set up
Posted by Jon Anstey <ja...@gmail.com>.
Added a wiki page here
http://cwiki.apache.org/confluence/display/CAMEL/Merging+commits+from+trunk+to+fixes+branch
On Tue, Nov 4, 2008 at 9:16 AM, Jon Anstey <ja...@gmail.com> wrote:
> Cool, glad you like it. I left one of your commits in the list yesterday so
> you could not resist trying it out ;)
>
> I'll add it to the wiki shortly.
>
>
> On Tue, Nov 4, 2008 at 4:09 AM, Claus Ibsen <ci...@silverbullet.dk> wrote:
>
>> Hi Jonathan
>>
>> This is fantastic. Works great, even on my poor laptop that runs XP.
>> Just merged the FTP passive mode that I wanted to backport manually, but
>> this comes to the rescure.
>>
>> Could you add your instructions as a wiki page to the camel documentations
>> under the developer guide section?
>>
>>
>> Med venlig hilsen
>>
>> Claus Ibsen
>> ......................................
>> Silverbullet
>> Skovsgårdsvænget 21
>> 8362 Hørning
>> Tlf. +45 2962 7576
>> Web: www.silverbullet.dk
>> -----Original Message-----
>> From: Jonathan Anstey [mailto:janstey@gmail.com]
>> Sent: 3. november 2008 22:13
>> To: camel-dev@activemq.apache.org
>> Subject: Camel 1.x branch set up
>>
>> Hi all,
>>
>> I've set up the Camel 1.x branch here:
>>
>> http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.x
>>
>> The idea is to be able to apply bug fixes to Camel 1.x while leaving new
>> features and other API breaking stuff on the trunk. I think in most
>> cases fixes will be happening on the trunk so I've set up svnmerge.py
>> (http://www.orcaware.com/svn/wiki/Svnmerge.py) to track commits from the
>> trunk to the 1.x branch.
>>
>> Example workflow:
>>
>> 1. You just committed a fix to the trunk in revision 123456 and think
>> that it would be useful to Camel 1.5 users
>>
>> 2. svn co
>> http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.xcamel-1.x
>>
>> 3. In camel-1.x directory, you can get a list of commits available from
>> the trunk
>>
>> janstey@mojo:/x1/apache/camel-1.x$ svnmerge.py avail -l
>> ------------------------------------------------------------------------
>> r123456 | janstey | 2008-11-01 01:08:18 -0230 (Sat, 01 Nov 2008) | 1 line
>> Changed paths:
>> M
>>
>> /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/SomeFile.java
>>
>> My awesome commit
>> janstey@mojo:/x1/apache/camel-1.x$
>>
>> 4. Merge your commit by running 'svnmerge.py merge -r 123456'
>>
>> 5. Resolve any conflicts in the merge
>>
>> 6. Commit it by running 'svn ci -F svnmerge-commit-message.txt'
>>
>> 7. If you have a JIRA associated with this fix, make sure it says fix
>> for 1.5.1 and/or 2.0.0
>>
>>
>> Now, it may seem like a bit of work at first but I think the merge
>> tracking will be very helpful later on. Let me know if you have any
>> questions or concerns on this stuff. Or better yet, if you have ideas on
>> how to make it better, let them be known! :)
>>
>> Cheers,
>> Jon
>>
>>
>
>
> --
> Cheers,
> Jon
>
> http://janstey.blogspot.com/
>
--
Cheers,
Jon
http://janstey.blogspot.com/
Re: Camel 1.x branch set up
Posted by Jon Anstey <ja...@gmail.com>.
Cool, glad you like it. I left one of your commits in the list yesterday so
you could not resist trying it out ;)
I'll add it to the wiki shortly.
On Tue, Nov 4, 2008 at 4:09 AM, Claus Ibsen <ci...@silverbullet.dk> wrote:
> Hi Jonathan
>
> This is fantastic. Works great, even on my poor laptop that runs XP.
> Just merged the FTP passive mode that I wanted to backport manually, but
> this comes to the rescure.
>
> Could you add your instructions as a wiki page to the camel documentations
> under the developer guide section?
>
>
> Med venlig hilsen
>
> Claus Ibsen
> ......................................
> Silverbullet
> Skovsgårdsvænget 21
> 8362 Hørning
> Tlf. +45 2962 7576
> Web: www.silverbullet.dk
> -----Original Message-----
> From: Jonathan Anstey [mailto:janstey@gmail.com]
> Sent: 3. november 2008 22:13
> To: camel-dev@activemq.apache.org
> Subject: Camel 1.x branch set up
>
> Hi all,
>
> I've set up the Camel 1.x branch here:
>
> http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.x
>
> The idea is to be able to apply bug fixes to Camel 1.x while leaving new
> features and other API breaking stuff on the trunk. I think in most
> cases fixes will be happening on the trunk so I've set up svnmerge.py
> (http://www.orcaware.com/svn/wiki/Svnmerge.py) to track commits from the
> trunk to the 1.x branch.
>
> Example workflow:
>
> 1. You just committed a fix to the trunk in revision 123456 and think
> that it would be useful to Camel 1.5 users
>
> 2. svn co
> http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.xcamel-1.x
>
> 3. In camel-1.x directory, you can get a list of commits available from
> the trunk
>
> janstey@mojo:/x1/apache/camel-1.x$ svnmerge.py avail -l
> ------------------------------------------------------------------------
> r123456 | janstey | 2008-11-01 01:08:18 -0230 (Sat, 01 Nov 2008) | 1 line
> Changed paths:
> M
>
> /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/SomeFile.java
>
> My awesome commit
> janstey@mojo:/x1/apache/camel-1.x$
>
> 4. Merge your commit by running 'svnmerge.py merge -r 123456'
>
> 5. Resolve any conflicts in the merge
>
> 6. Commit it by running 'svn ci -F svnmerge-commit-message.txt'
>
> 7. If you have a JIRA associated with this fix, make sure it says fix
> for 1.5.1 and/or 2.0.0
>
>
> Now, it may seem like a bit of work at first but I think the merge
> tracking will be very helpful later on. Let me know if you have any
> questions or concerns on this stuff. Or better yet, if you have ideas on
> how to make it better, let them be known! :)
>
> Cheers,
> Jon
>
>
--
Cheers,
Jon
http://janstey.blogspot.com/
RE: Camel 1.x branch set up
Posted by Claus Ibsen <ci...@silverbullet.dk>.
Hi Jon
Could you also add information about the branch at the source wiki page?
http://activemq.apache.org/camel/source.html
It currently only has the trunk.
Med venlig hilsen
Claus Ibsen
......................................
Silverbullet
Skovsgårdsvænget 21
8362 Hørning
Tlf. +45 2962 7576
Web: www.silverbullet.dk
-----Original Message-----
From: Jonathan Anstey [mailto:janstey@gmail.com]
Sent: 3. november 2008 22:13
To: camel-dev@activemq.apache.org
Subject: Camel 1.x branch set up
Hi all,
I've set up the Camel 1.x branch here:
http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.x
The idea is to be able to apply bug fixes to Camel 1.x while leaving new
features and other API breaking stuff on the trunk. I think in most
cases fixes will be happening on the trunk so I've set up svnmerge.py
(http://www.orcaware.com/svn/wiki/Svnmerge.py) to track commits from the
trunk to the 1.x branch.
Example workflow:
1. You just committed a fix to the trunk in revision 123456 and think
that it would be useful to Camel 1.5 users
2. svn co
http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.x camel-1.x
3. In camel-1.x directory, you can get a list of commits available from
the trunk
janstey@mojo:/x1/apache/camel-1.x$ svnmerge.py avail -l
------------------------------------------------------------------------
r123456 | janstey | 2008-11-01 01:08:18 -0230 (Sat, 01 Nov 2008) | 1 line
Changed paths:
M
/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/SomeFile.java
My awesome commit
janstey@mojo:/x1/apache/camel-1.x$
4. Merge your commit by running 'svnmerge.py merge -r 123456'
5. Resolve any conflicts in the merge
6. Commit it by running 'svn ci -F svnmerge-commit-message.txt'
7. If you have a JIRA associated with this fix, make sure it says fix
for 1.5.1 and/or 2.0.0
Now, it may seem like a bit of work at first but I think the merge
tracking will be very helpful later on. Let me know if you have any
questions or concerns on this stuff. Or better yet, if you have ideas on
how to make it better, let them be known! :)
Cheers,
Jon
RE: Camel 1.x branch set up
Posted by Claus Ibsen <ci...@silverbullet.dk>.
Hi Jonathan
This is fantastic. Works great, even on my poor laptop that runs XP.
Just merged the FTP passive mode that I wanted to backport manually, but this comes to the rescure.
Could you add your instructions as a wiki page to the camel documentations under the developer guide section?
Med venlig hilsen
Claus Ibsen
......................................
Silverbullet
Skovsgårdsvænget 21
8362 Hørning
Tlf. +45 2962 7576
Web: www.silverbullet.dk
-----Original Message-----
From: Jonathan Anstey [mailto:janstey@gmail.com]
Sent: 3. november 2008 22:13
To: camel-dev@activemq.apache.org
Subject: Camel 1.x branch set up
Hi all,
I've set up the Camel 1.x branch here:
http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.x
The idea is to be able to apply bug fixes to Camel 1.x while leaving new
features and other API breaking stuff on the trunk. I think in most
cases fixes will be happening on the trunk so I've set up svnmerge.py
(http://www.orcaware.com/svn/wiki/Svnmerge.py) to track commits from the
trunk to the 1.x branch.
Example workflow:
1. You just committed a fix to the trunk in revision 123456 and think
that it would be useful to Camel 1.5 users
2. svn co
http://svn.apache.org/repos/asf/activemq/camel/branches/camel-1.x camel-1.x
3. In camel-1.x directory, you can get a list of commits available from
the trunk
janstey@mojo:/x1/apache/camel-1.x$ svnmerge.py avail -l
------------------------------------------------------------------------
r123456 | janstey | 2008-11-01 01:08:18 -0230 (Sat, 01 Nov 2008) | 1 line
Changed paths:
M
/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/SomeFile.java
My awesome commit
janstey@mojo:/x1/apache/camel-1.x$
4. Merge your commit by running 'svnmerge.py merge -r 123456'
5. Resolve any conflicts in the merge
6. Commit it by running 'svn ci -F svnmerge-commit-message.txt'
7. If you have a JIRA associated with this fix, make sure it says fix
for 1.5.1 and/or 2.0.0
Now, it may seem like a bit of work at first but I think the merge
tracking will be very helpful later on. Let me know if you have any
questions or concerns on this stuff. Or better yet, if you have ideas on
how to make it better, let them be known! :)
Cheers,
Jon