Merging with subversion 1.4
See: http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html
- Find when your branch was created:
svn log -v --stop-on-copy http://svn.example.com/repos/calc/branches/my-calc-branch
- We discover the branch was created in revision 341.
- Find your current revision:
svn up
- Our current revision is 405.
- Merge the changes (run this in the working copy you want to apply it to):
svn merge -r 341:405 http://svn.example.com/repos/calc/trunk
- Commit the changes with the merge command in the log message:
svn commit -m "svn merge -r 341:405 http://svn.example.com/repos/calc/trunk"
Tip: When next merging trunk to your branch merge from the next revision after your last merge to the latest rev. Eg, in the above case it would be svn merge -r 406:420