Re: integration branch in plasma-mobile
On Saturday, November 17, 2012 19:37:49 Marco Martin wrote: On Saturday 17 November 2012, Sebastian Kügler wrote: When is the integration branch updated from the topic branches? as i understood it, when you do important changes in the topic branch that really may affect the review of the thing, you merge again your topic branch in integration. also, merge only when the topic branch got good enough for you ie doesn't have important breakages you know of Right, that sounds good. I didn't take into account that we could merge into integration ourselves. Sounds fine to me. :) -- sebas http://www.kde.org | http://vizZzion.org | GPG Key ID: 9119 0EF9 ___ Active mailing list Active@kde.org https://mail.kde.org/mailman/listinfo/active
Re: integration branch in plasma-mobile
On Saturday, November 17, 2012 18:43:00 Sebastian Kügler wrote: When is the integration branch updated from the topic branches? i'll be doing this at least each monday, more frequently for branches that are either moving faster, when requested or if i'm super bored. ;) -- Aaron J. Seigo signature.asc Description: This is a digitally signed message part. ___ Active mailing list Active@kde.org https://mail.kde.org/mailman/listinfo/active
Re: integration branch in plasma-mobile
On Saturday, November 17, 2012 19:37:49 Marco Martin wrote: as i understood it, when you do important changes in the topic branch that really may affect the review of the thing, you merge again your topic branch in integration. i think it would be best if we have just one person, with a backup individual for when they are not available, managing the integration branch. with just a couple of branches, it's not likely to be a big deal. but with more branches from more developers, particularly if/when things don't merge cleanly, it is likely to get messier and coordination more difficult. it will become difficult to maintain a known quality status if people are merging branches at various times, particularly if branch merges end up requiring a specific order to the merges. if things break in integration, knowing when which branch was merged becomes pretty important. yes, there is git log, but parsing that will get more difficult as the number of branches grows and the amount of time a branch is in integration increases. finally, there's the matter of merging branches into master, which will result in a rebase of integration to master and a re-merge into integration of the branches that were not merged into master. unless we coordinate on when that happens and who is doing it, eventually we'll end up wtih multiple people doing multiple merges and causing problems (and time wasted) when trying to push to git.kde.org so please, at least for now, let me know via email to this list when a branch should start to be tracked by integration. we can see how this works in practice after some months and make adjustments to the workflow if necessary. -- Aaron J. Seigo signature.asc Description: This is a digitally signed message part. ___ Active mailing list Active@kde.org https://mail.kde.org/mailman/listinfo/active
Re: integration branch in plasma-mobile
On Sunday, November 18, 2012 16:04:00 Aaron J. Seigo wrote: On Saturday, November 17, 2012 18:43:00 Sebastian Kügler wrote: When is the integration branch updated from the topic branches? i'll be doing this at least each monday, more frequently for branches that are either moving faster, when requested or if i'm super bored. ;) That works for me. :) -- sebas http://www.kde.org | http://vizZzion.org | GPG Key ID: 9119 0EF9 ___ Active mailing list Active@kde.org https://mail.kde.org/mailman/listinfo/active
Re: integration branch in plasma-mobile
On Wednesday, November 14, 2012 16:08:31 Aaron J. Seigo wrote: hello ... so i *finally* got around to creating the integration branch in plasma-mobile. from this point forward, only peer reviewed bug fixes and obvious, can't-be- wrong trivial fixes should be pushed into master. ALL other activity must occur in topic branches. once the branch is ready to be pushed, create a review request on reviewboard.kde.org and after initial review, i will merge it into the integration branch. topic branches should be started from the master branch. all pre-release testing should be done using the integration branch. every monday, all topic branches will be merged into master that have: * successfully been merged in the integration branch * have been tested and peer reviewed with an explicit +1 from at lesat one other core developer and/or tester at that point, i will then rebase the integration branch on master and re- integrate all branches under review. this will make it a messy branch in terms of git history since it will be rebased often; this is not a problem as it will never merged back into master. this means *no commits* should ever be made directly to the integration branch. only to topic branches. cheers, and best of luck to us all in this new experiment :) When is the integration branch updated from the topic branches? -- sebas http://www.kde.org | http://vizZzion.org | GPG Key ID: 9119 0EF9 ___ Active mailing list Active@kde.org https://mail.kde.org/mailman/listinfo/active
Re: integration branch in plasma-mobile
On Saturday 17 November 2012, Sebastian Kügler wrote: at that point, i will then rebase the integration branch on master and re- integrate all branches under review. this will make it a messy branch in terms of git history since it will be rebased often; this is not a problem as it will never merged back into master. this means *no commits* should ever be made directly to the integration branch. only to topic branches. cheers, and best of luck to us all in this new experiment :) When is the integration branch updated from the topic branches? as i understood it, when you do important changes in the topic branch that really may affect the review of the thing, you merge again your topic branch in integration. also, merge only when the topic branch got good enough for you ie doesn't have important breakages you know of Cheers, Marco Martin ___ Active mailing list Active@kde.org https://mail.kde.org/mailman/listinfo/active
Re: integration branch in plasma-mobile
On Wednesday, November 14, 2012 19:35:44 Thomas Pfeiffer wrote: Will there be Mer-based images which contain packages from Integration? That we'll have a repository that tracks it, yes. so the process will probably look like this: * install the stock image * change one of the zypper repositories i'm considering adding this to the development settings panel so you can activate it easily from there rather than doing it from the command line. this new repo won't happen immediately though. i'll inform the list when we do have it set up. -- Aaron J. Seigo signature.asc Description: This is a digitally signed message part. ___ Active mailing list Active@kde.org https://mail.kde.org/mailman/listinfo/active
Re: integration branch in plasma-mobile
On Wednesday 14 November 2012 16:08:31 Aaron J. Seigo wrote: hello ... so i *finally* got around to creating the integration branch in plasma-mobile. from this point forward, only peer reviewed bug fixes and obvious, can't-be- wrong trivial fixes should be pushed into master. ALL other activity must occur in topic branches. once the branch is ready to be pushed, create a review request on reviewboard.kde.org and after initial review, i will merge it into the integration branch. topic branches should be started from the master branch. all pre-release testing should be done using the integration branch. Will there be Mer-based images which contain packages from Integration? That would be necessary for testing the integration branch. I'd use such an image on my daily-use Wetab then and test it continuously (of course knowing that it may break from time to time ;). every monday, all topic branches will be merged into master that have: * successfully been merged in the integration branch * have been tested and peer reviewed with an explicit +1 from at lesat one other core developer and/or tester Great! I also like that we'll be using Reviewboard. I love that tool, even as a non-developer :) at that point, i will then rebase the integration branch on master and re- integrate all branches under review. this will make it a messy branch in terms of git history since it will be rebased often; this is not a problem as it will never merged back into master. this means *no commits* should ever be made directly to the integration branch. only to topic branches. cheers, and best of luck to us all in this new experiment :) It's surely going to give quality a big boost! ___ Active mailing list Active@kde.org https://mail.kde.org/mailman/listinfo/active
Re: integration branch in plasma-mobile
On Wednesday 14 November 2012 16:08:31 Aaron J. Seigo wrote: hello ... so i *finally* got around to creating the integration branch in plasma-mobile. from this point forward, only peer reviewed bug fixes and obvious, can't-be- wrong trivial fixes should be pushed into master. ALL other activity must occur in topic branches. once the branch is ready to be pushed, create a review request on reviewboard.kde.org and after initial review, i will merge it into the integration branch. topic branches should be started from the master branch. all pre-release testing should be done using the integration branch. every monday, all topic branches will be merged into master that have: * successfully been merged in the integration branch * have been tested and peer reviewed with an explicit +1 from at lesat one other core developer and/or tester at that point, i will then rebase the integration branch on master and re- integrate all branches under review. this will make it a messy branch in terms of git history since it will be rebased often; this is not a problem as it will never merged back into master. this means *no commits* should ever be made directly to the integration branch. only to topic branches. cheers, and best of luck to us all in this new experiment :) Oh and currently Master contains some quite severe regressions compared to PA3 (already reported to BKO), which should be fixed before we have a releasable state. ___ Active mailing list Active@kde.org https://mail.kde.org/mailman/listinfo/active
