Merging commits from trunk to fixes branchPage edited by Claus IbsenChanges (1)
Full ContentThe 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. Using svnmerge.py scriptI'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
there is a DoMerges.java file in there that you can compile and run from a fixes branch checkout. It lists all the outstanding commits that haven't been reviewed, allows you to merge commits individually, block commits, show the diffs, etc. To run the file do, from the directory with the branch. java DoMerges You need svnmerge.py to be runnable from the command line. There is a compiled .class of the DoMerges attached to this wiki page you can download. However its easy to compile javac DoMerges.java Using gitIf you already use git-svn, you could consider using the great git merge capabilities. Create a local branch from the remote tracking branch (e.g. camel-2.8.x) git checkout -b camel-2.8.x remotes/camel-2.8.x or switch into the existing branch git checkout camel-2.8.x To merge one revision (e.g. 1176050) into this branch, run git cherry-pick 1176050 This will merge and commit the changes into your local git repository.
Run git svn dcommit to push your local changes into the Apache SVN repository. If you have a JIRA associated with this fix, make sure it says fix for 2.8.x.
Change Notification Preferences
View Online
|
View Changes
|
Add Comment
|
- [CONF] Apache Camel > Merging commits from trunk to fixes br... confluence
- [CONF] Apache Camel > Merging commits from trunk to fix... confluence
- [CONF] Apache Camel > Merging commits from trunk to fix... confluence
- [CONF] Apache Camel > Merging commits from trunk to fix... confluence
- [CONF] Apache Camel > Merging commits from trunk to fix... confluence
- [CONF] Apache Camel > Merging commits from trunk to fix... confluence
- [CONF] Apache Camel > Merging commits from trunk to fix... confluence
- [CONF] Apache Camel > Merging commits from trunk to fix... confluence
