Hi Paul, It sounds like we are now on roughly the same wavelength w.r.t how to progress.
> Right, but that is for maintenance of the next stable branch. How about the > current one (2.4)? I'd suggest going with a branch from 2.4.0 or 2.5.1 (if you want to be lazy) i,e svn copy http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-2.4.0 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.4.x Or name the branch OpenSceneGraph-2.4, or OpenSceneGraph-2.4.series. I'm open to suggestions on naming of a branch - whatever makes sense to those browsing the branches. Or perhaps we should start with an OpenSceneGraph-test branch. > At this point I'd suggest to create the 2.4 branch and allow some people to > backport stuff from the trunk as a first step. When we get to a point where > a 2.4.1 release is viable we can look at the infrastructure needed in terms > of scripts. This first release might even be done by hand to get to know > what is needed and what can be automated. I can post my simple scripts on the wiki, scripts are good as once you have one that works reliably you can make releases without worrying about making typo's at a crucial moment. > For the actual merging from trunk to the stable branch I suggest we take a > good look at svnmerge (http://www.orcaware.com/svn/wiki/Svnmerge.py). This > is a script that assists in the merging process, preventing the same things > to become merged twice among other things. It also keeps a list of revisions > already merged for a branch and has an option to block certain revisions > from being merged. The other nice thing is that it copies the log messages > of revisions being merged, so it's easy to track what a merged revision > actually contained (assuming the original log message was descriptive). The > Python folks use it extensively and seem to be happy with it. Here's an > example log message from the branch being merged _into_, note the two > revisions coming in: I'll leave it up to you guys to work out what tools. Another thing that might be useful is watching svn check-ins, as well as convansing users requests for particular fixes to be merged. -- I can easily make the branch once we decide upon an name, then we'll need Jose Luis Hidalgo to add logins and write permissions for yourself, Eric and any others who wish to work on maintaining 2.4.x. Robert. _______________________________________________ osg-users mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
