Hi Maria, these the changes to "trunk" are being merged "forward" to the 2.x work. For plugins that has not been done yet. For Trinidad core, we did.
I think generally it is about time to do another round of rebranching, next week or so. Why? Becuase developement on trunk is not stopping :-) and the longer we wait, the worse the final merge is. During that I can also merge the plugins work. -Matthias On Wed, Feb 3, 2010 at 6:50 AM, Maria Kaval <maria.ka...@oracle.com> wrote: > Andrew, > > For trinidad-maven changes, do they need to be checked in to both > Trinidad-maven/branches/2.0.x-branch and trinidad-maven/trunk or is it > sufficient to just check into trinidad-maven/trunk and then someone will do a > rebase for trinidad-maven/branches/2.0.x-branch on a periodic basis? I'm > thinking of e.g. JIRA 1677. > https://issues.apache.org/jira/browse/TRINIDAD-1677 > > Thanks, Maria > > -----Original Message----- > From: Andrew Robinson [mailto:andrew.rw.robin...@gmail.com] > Sent: Wednesday, January 06, 2010 10:11 AM > To: MyFaces Development > Subject: [Trinidad 2] Plugins branch moved > > Guys, with the okay from Matthias, I renamed the plugins 2.0 branch from: > > https://svn.apache.org/repos/asf/myfaces/trinidad-maven/branches/2.0.0-branch > > to > > https://svn.apache.org/repos/asf/myfaces/trinidad-maven/branches/2.0.x-branch > > So that it reflects the fact that the last digit is changing. This is > our "trunk" for the 2.0 plugins. > > For existing working copies, run an "svn switch" to switch the URL to > the new name. > > Thanks, > Andrew > -- Matthias Wessendorf blog: http://matthiaswessendorf.wordpress.com/ sessions: http://www.slideshare.net/mwessendorf twitter: http://twitter.com/mwessendorf
