Hi all, > Author: vhennebert > Date: Sat Jul 21 02:50:32 2007 > New Revision: 558281 > > URL: http://svn.apache.org/viewvc?view=rev&rev=558281 > Log: > Initialize merge tracking via "svnmerge" from the Trunk > (for applying to the 0.94 branch the applicable changes in the Trunk) > > Modified: > xmlgraphics/fop/branches/fop-0_94/ (props changed) > > Propchange: xmlgraphics/fop/branches/fop-0_94/ > ------------------------------------------------------------------------------ > svnmerge-integrated = /xmlgraphics/fop/trunk:1-556565
For those who don't know svnmerge.py and are wondering what I'm doing, here are some explanations: svnmerge is a handy, non-intrusive, simple tool that helps to handle different branches. It lets you know which revisions may be merged from the branch, chose which ones to merge and which ones to block, avoid merging the same change twice, etc. For more information see svnmerge's home page: http://www.orcaware.com/svn/wiki/Svnmerge.py After having succesfully tried it for Commons, I'm going to use it to manage the 0.94 branch. To avoid confusion it's probably best that only the release manager use it. If you see that I block changes that in your opinion should go in the branch as well, drop a note on fop-dev. Remember: code changes should be made on the Trunk. Only the website part will be changed in the branch, so that the Trunk version reflects the current one and we can re-build it if necessary. Also, please commit atomic changes so that it's easier to manage blocked and merged revisions. Thanks, Vincent
