What about getting this current version of the core trunk released? If we don't get a decent version of the 1.1.x core out there soon we won't have anybody interested in a 1.2.x version. If we manage to get a stable core release done I think we can just leave the "trunk" alone.
There shouldn't be too many more bug fixes - and if there are - we just merge them up to the branch. I haven't been following the branch but I can see a situation where some of the fixes might not merge so cleanly. In these cases we'll have to do a manual merge. Sean On 8/25/06, Dennis Byrne <[EMAIL PROTECTED]> wrote:
I can't really take 'ownership' of this one, but I'll give it a shot. If anything, it would be an excellent way for one of us to stay up to task on all the latest core changes. Dennis Byrne >-----Original Message----- >From: Mike Kienenberger [mailto:[EMAIL PROTECTED] >Sent: Friday, August 25, 2006 05:24 PM >To: 'MyFaces Development' >Subject: Re: Keeping 1.2 in sync with 1.1 patches? > >I'm a novice when it comes to merging, but what about periodically >merging changes from 1.1 core to the 1.2 branch? Maybe once a week or >something? Is that a possible solution? > >On 8/25/06, Martin Marinschek <[EMAIL PROTECTED]> wrote: >> Afaik, we're supposed to work on both branches, with the hope of >> merging again sometime down the road. I wonder how this will work >> though, with all the changes that 1.2 will require with regards to >> JDK1.5. >> >> regards, >> >> Martin >> >> On 8/25/06, Mike Kienenberger <[EMAIL PROTECTED]> wrote: >> > This is just a quick question before I forget to ask it again.... >> > >> > How are those of you who are working on the 1.2 branch keeping the >> > patches to core1.1 in sync? >> > >> > From the commit messages I've seen, the only changes have been to >> > implement 1.2 specific functionality. >> > >> >> >> -- >> >> http://www.irian.at >> >> Your JSF powerhouse - >> JSF Consulting, Development and >> Courses in English and German >> >> Professional Support for Apache MyFaces >> >
