Hi all, The procedure for 1.2.1 merges is simple; developers merge to both the branch and to trunk. As RM I'm not going to do any merging back to trunk, I'll leave that to individual committers. Should make things go faster at the end of a release (since nothing needs to be done to keep trunk up to date), though it means twice the commits if a fix fixes multiple things.
I'd recommend that when you do the fix on 1.2.x, you want to then merge it back to trunk (not just reapply the fix). This was the merge info is kept up to date. Chris -- Christopher Brooks, BSc, MSc ARIES Laboratory, University of Saskatchewan Web: http://www.cs.usask.ca/~cab938 Phone: 1.306.966.1442 Mail: Advanced Research in Intelligent Educational Systems Laboratory Department of Computer Science University of Saskatchewan 176 Thorvaldson Building 110 Science Place Saskatoon, SK S7N 5C9 _______________________________________________ Matterhorn mailing list [email protected] http://lists.opencastproject.org/mailman/listinfo/matterhorn To unsubscribe please email [email protected] _______________________________________________
