[core] Keep 2.1.x branch and trunk in sync

2011-04-29 Thread Jakob Korherr
Hi guys, Since we now have a branch for JSF 2.1 [1], but still are fixing most issues in JSF 2.0 and thus in trunk, every commiter should take care of merging his/her changes into the 2.1.x branch too. Otherwise we will soon have a big mess, I guess. I already merged MYFACES-3116 into 2.1.x and

Re: [core] Keep 2.1.x branch and trunk in sync

2011-04-29 Thread Bernd Bohmann
Hello, Jakob a good point. I would suggest to create a 2.0.x branch and move 2.1.x to trunk. Regards Bernd On Fri, Apr 29, 2011 at 1:34 PM, Jakob Korherr jakob.korh...@gmail.com wrote: Hi guys, Since we now have a branch for JSF 2.1 [1], but still are fixing most issues in JSF 2.0 and thus

Re: [core] Keep 2.1.x branch and trunk in sync

2011-04-29 Thread Leonardo Uribe
Hi I'll do it this weekend ( create a 2.0.x branch and move 2.1.x to trunk ). I hope before each release run a svn merge task between both branches to keep them in sync. regards, Leonardo 2011/4/29 Bernd Bohmann bernd.bohm...@atanion.com Hello, Jakob a good point. I would suggest to

Re: [core] Keep 2.1.x branch and trunk in sync

2011-04-29 Thread Jakob Korherr
Hi Leo, That's great news, thanks! Just as a note: please don't forget to change the svn:externals on current20 and current21 too! Regards, Jakob 2011/4/29 Leonardo Uribe lu4...@gmail.com: Hi I'll do it this weekend ( create a 2.0.x branch and move 2.1.x to trunk ). I hope before each

Re: [core] Keep 2.1.x branch and trunk in sync

2011-04-29 Thread Leonardo Uribe
Hi Jakob Ok, I'll keep that in mind. regards, Leonardo