On Thursday 06 December 2012 01:40:48 Marek Lindner wrote: [...]
I am a little confused here. Our "next" branch will be the new "master" and the new "master" will be what "maint" is today ?
Ok, lets rename then:
* new_features (previously called next; in my first explanation called next) * rc_work (previously called maint; in my previous explanation called master)
I also don't see the implementation of the new merge policy yet. David can only receive what we merged before but how do we determine what patch to merge when and how ?
Stuff which will be accepted by David Báthory in his net repo: put it into rc_work. So small bugfixes
The stuff which will be accepted by David the Impaler in his net-next repo: put it into new_features. This includes non-next related cleanups, features, ... But no bugs. Bugs will not be accepted by the relentless David.
So it is the same as before but with the master branch removed
Up to now there was a simple rule (spawned from your head iirc): Features into master, cleanups into master, fixes for next into next and very critical stuff into maint. How is that supposed to work in the future?
Nope, not entirely. The master requirement was from you.
One very vocal voice keeps telling me: Just merge everything into the "new next" - the rest will fall into place. No need to worry.
Does this "vocal voice" has a name?
Kind regards, Sven