That makes sense. That is probably the only reason to ever merge such a branch back into master -- essentially the 3.0.0 branch that we have now is treated as a 'feature' branch, to be merged into master when it is ready (and after the long-lived 2.9.x branch splits off).
Then, later, we can actually split off a 3.0.x release branch, a 3.1.x release branch, etc. On Wed, Jun 5, 2013 at 1:11 PM, Filip Maj <[email protected]> wrote: > Joe and I were just talking about how the process of integrating an > API-less cordova (I.e. The 3.0 branches) back into the master branches > would work. I imagine that, as soon as we create a release branch for > 2.9.0 / tag 2.9.0rc1, we will merge/rebase the 3.0 branch into master > right away. Then we can have all committers/contributors start > iterating/testing the composable plugin/api approach right off the master > branch, in prep for 3.0. > > On 6/5/13 9:52 AM, "Filip Maj" <[email protected]> wrote: > > >A lot of work is being put into breaking out the plugins into individual > >repositories, as a prep for 3.0. One of my goals on this project is to > >ship a Cordova for 3.0 that allows users to compose a cordova application > >shell with whatever plugins they wish, including the core APIs. This way > >users don't need to bundle all core APIs (and related permissions, etc.) > >with every app they build. > > > >So just a friendly reminder that, if you are patching a particular core > >API, be it javascript or native code, please remember to also patch the > >plugin repository with the same commit. I understand it can be a bit of > >pain to double-up your work, but this should be a temporary thing that > >will no longer be necessary post-3.0. > > > >Related to this: if anyone is curious about what the cordova libraries > >will look like for 3.0, there are long-lived 3.0 branches being worked on > >on all the main cordova implementations (android, blackberry, iOS, and the > >windows phones) where the core APIs are being ripped out, and any weird > >coupling between API code and the underlying framework is being slowly > >teased out. > > > >Thank you! :) > > > >Fil > > > >
