Elias Torres wrote:
Hi guys, I was wondering where new 4.0 work should go in: trunk or 4.0 branch? I'm worried about using 4.0 branch because it has been taken over by JPA work and I don't deal with the work in progress there. Could we make a branch for JPA-only and have a 4.0 branch for smaller work items that won't break the rest of app for me (and others) to work on?
Well, this definitely needs a decision. My take is that the current trunk (representing 3.2-dev) is basically frozen aside from fixes that will be required to polish the 3.2 release. So as soon as 3.1 is final and is released we should start the 3.2 release process and try to get that out the door and be done with the 3.x tree.
New features like the ones you proposed for 4.0 should be done in a 4.0 branch and that's where I plan to do my development now. The problem is the JPA and datamapper stuff which is in there now is not stable yet and I don't think there is a near term ETA for when we would all be convinced it is stable, so I would agree that we should consider creating a new 4.0 branch from the current trunk and moving the current 4.0 branch to be a JPA branch.
That way main development can continue in the 4.0 branch while the JPA work happens, and the JPA branch would essentially be merging changes from the 4.0 branch and not the trunk.
-- Allen
I hope you are having a nice day! -Elias
