{section: Active source code release branches, or where should my code go?} -*: Code that implements new features or non-urgent bug fixes, aka code targeted for v8.3.x, should go into a work branch for now. Please do _not_ commit new features into branch *master* until after the 8.2 release branch has been created. This will happen in late May, or early June. +*: Code that implements new features or non-urgent bug fixes, aka code targeted for v8.3.x, should go into the *master* branch. -*: Urgent bug fixes to developer release candidate go into *V8_1_6-branch, but only with permission of the wrangler*. They should then be merged into *master*. {linebreak} {strike}V8_1_6-branch is *frozen*, and requests to commit to this branch will probably be denied.{endstrike} +*: Bug fixes and stabilization work for the next stable series should go into the *V8_2-branch*, it should then be merged into *master*. -*: Serious bug fixes to stable series features should go into *V8_0-branch*. _ALL COMMITS TO A STABLE BRANCH {wiki: PerformingCodeReviews MUST BE CODE REVIEWED}_ - the ticket should show who did the code review. Commits should then be merged into -*:: *V8_1_6-branch* with permission of the wranger,and/or +*: Urgent bug fixes to developer release candidate go into *V8_1_6-branch, but only with permission of the wrangler*. They should then be merged into *V8_2-branch* and then to *master*. {linebreak} V8_1_6-branch is *frozen*, and requests to commit to this branch will probably be denied, check with gthain if johnkn is not available. + +*:{strike} Serious bug fixes to stable series features should go into *V8_2-branch*. _ALL COMMITS TO A STABLE BRANCH {wiki: PerformingCodeReviews MUST BE CODE REVIEWED}_ - the ticket should show who did the code review. Commits should then be merged into +*:: {strike}*V8_3_0-branch* with permission of the wranger,and/or{endstrike} *:: *master*, as above. +{endstrike} *: If code needs to be reviewed before pushing, then you should use "git format-patch" to create a patch, and attach it to the ticket. If it's a larger change, you should put it into a topic branch instead.