You are viewing an old version of this page. View the current version.

Compare with Current View Page History

« Previous Version 6 Next »

The Camel 2.x branches are here:

The idea is to be able to apply bug fixes to Camel 2.x maintenance branches (for example 2.8.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 to track commits from the trunk to the 2.x branches.

Example workflow:

1. You just committed a fix to the trunk in revision 123456 and think that it would be back ported to Camel 2.8.x users

2. Check out the branch

svn co https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x camel-2.8.x

3. In camel-2.8.x directory, you can get a list of commits available from the trunk

svnmerge.py avail

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 2.8.x.

  • No labels