Re: integration branch in plasma-mobile

2012-11-18 Thread Sebastian Kügler
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

Re: integration branch in plasma-mobile

2012-11-18 Thread Aaron J. Seigo
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

Re: integration branch in plasma-mobile

2012-11-18 Thread Aaron J. Seigo
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

Re: integration branch in plasma-mobile

2012-11-18 Thread Sebastian Kügler
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,

Re: integration branch in plasma-mobile

2012-11-17 Thread Sebastian Kügler
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

Re: integration branch in plasma-mobile

2012-11-17 Thread Marco Martin
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

Re: integration branch in plasma-mobile

2012-11-15 Thread Aaron J. Seigo
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

Re: integration branch in plasma-mobile

2012-11-14 Thread Thomas Pfeiffer
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

Re: integration branch in plasma-mobile

2012-11-14 Thread Thomas Pfeiffer
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