On 04/08/2014 07:51 PM, Rodney Dawes wrote: > On Tue, 2014-04-08 at 15:30 +0300, Alberto Mardegan wrote: >> In the last 5 minutes of the session, a solution was proposed: leaving >> "trunk" for development purpose (like it was before the CI train >> started) and push the landed commits into other branches, such as >> "trusty". > > And what exactly would be landing commits to "trunk", or to "trusty" > there?
To trunk: the merge bot, whenever a merge proposal is top-approved. To "trusty": the land bot, whenever a merge proposal lands on the trusty archive. > If all commits land in some branch that's not trunk, then trunk isn't > trunk, it is some thing that's behind the other branch in terms of > commits. With this proposal, all commits land to trunk. At some point (hopefully often) trunk is tested in a silo and lands into the current development release, at which point its merged into a branch called after the current development release (e.g., "trusty"). I think that Alexander summarized it quite well, but to try even a shorter version, the only differences from today are: 1) At the end of the CI train, when a branch lands into an Ubuntu archive, the code is merged into a branch named after the Ubuntu release where the branch landed (e.g. trusty, saucy), instead of trunk 2) When a MP to trunk is top-approved, it gets automatically merged. Ciao, Alberto -- Mailing list: https://launchpad.net/~ubuntu-phone Post to : [email protected] Unsubscribe : https://launchpad.net/~ubuntu-phone More help : https://help.launchpad.net/ListHelp
