Sean, what you are proposing is something like this: .../myfaces/core/branches/1_1/1_1_2 .../myfaces/core/branches/1_1/1_1_3 .../myfaces/core/trunk <-- JSF 1.2 Right?
What about the following solution: .../myfaces/core_1_1/trunk .../myfaces/core_1_1/branches/1_1_2 .../myfaces/core_1_1/branches/1_1_3 .../myfaces/core_1_2/trunk .../myfaces/core_1_2/branches/1_2_0 .../myfaces/core_1_2/branches/1_2_1 Is it possible to merge code from different repo roots? In other words: Would we be able to merge down (up?) changes from .../myfaces/core_1_2/trunk to .../myfaces/core_1_1/trunk ? Thoughts? Manfred On 4/24/06, Sean Schofield <[EMAIL PROTECTED]> wrote:
Martin, I'm not saying that we release the trunk. What I'm saying is that since everything will be merged down to the trunk eventually it might be better for the massive changes to be on the trunk instead of the branch. The nightly builds would still come from the branch. And subsquent core-1.1.x releases would branch off of the branch. After each 1.1.x core release we can merge down to the branch and then to the trunk. (The trunk would be 1.2.0) This allows for frequent and small merges as we go instead of a large merge when 1.2.0 is released many months from now. Keep in mind that we can't really merge the other direction b/c the 1.2.0 stuff might break the current core. Sean On 4/24/06, Martin Marinschek <[EMAIL PROTECTED]> wrote: > Sean was - in number 2 - proposing to put JSF1.2 on the trunk - not on > the branch. > > That we don't want, except our users have something to work on with > the nightly version of MyFaces. > > regards, > > Martin > > On 4/24/06, Stan Silvert <[EMAIL PROTECTED]> wrote: > > I like Sean's plan. Martin, can you help me understand your objections > > concerning Tomcat 6? I don't understand why having Tomcat 6 in a > > released version makes a difference. > > > > Stan Silvert > > JBoss, Inc. > > [EMAIL PROTECTED] > > callto://stansilvert > > > -----Original Message----- > > > From: Martin Marinschek [mailto:[EMAIL PROTECTED] > > > Sent: Monday, April 24, 2006 2:26 AM > > > To: MyFaces Development > > > Subject: Re: JSF 1.2: branch, wiki, maven repo, ... > > > > > > Number #2 is no-no for me, as long as we don't have Tomcat 6 in a > > > decent, usable release out. > > > > > > regards, > > > > > > Martin > > > > > > On 4/24/06, Sean Schofield <[EMAIL PROTECTED]> wrote: > > > > Since there seems to be enough interest to go forward on this, I > > have > > > > two suggestions for you. > > > > > > > > 1.) Wait until the next core 1.1.3 release (end of this week.) > > > > > > > > 2.) Make the JSF 1.1 stuff the branch and put the JSF 1.2 stuff on > > the > > > > *trunk.* > > > > > > > > The thinking on number two is that there shouldn't be a lot of > > changes > > > > to the core other then minor bug fixes. So when we do have to merge > > > > it will be easier to merge the smaller set of changes. > > > > > > > > We can change the externals in "current" to point to the branch. > > > > > > > > If we follow my suggestion on #2 I suggest posting a new thread > > > > followed where this is clearly stated. Some people might have > > strong > > > > feelings on the issue and we want to make sure their voices are > > heard. > > > > > > > > Sean > > > > > > > > > > > > > -- > > > > > > http://www.irian.at > > > > > > Your JSF powerhouse - > > > JSF Consulting, Development and > > > Courses in English and German > > > > > > Professional Support for Apache MyFaces > > > > > -- > > http://www.irian.at > > Your JSF powerhouse - > JSF Consulting, Development and > Courses in English and German > > Professional Support for Apache MyFaces >
