[Releasing] State of Qt 5.0.0 wk 50 & Meeting minutes: release team meeting 12.12.2012

[Ahumada Sergio]

On 12/13/2012 05:20 PM, Thiago Macieira wrote:> On quinta-feira, 13 de dezembro de 2012 16.41.04, Simon Hausmann wrote:
>>> this is already a defeat of the branching concept. repeat after me:
>>> cherry-picks are *bad*.
>>
>> Can you outline why you believe that they are bad? Is it because the
>> commits  will appear twice in the history, once in stable and once in
>> release?
>>
>> It seems to me that we're trading developer convenience (push changes to
>> stable, release dudes selectively pick) against git history hygiene
> 
> Pushing to releases but requiring an approval from the release team was part
> of the original branching proposal.
> 

so .. will we have a mixed approach ?

push to refs/for/release + cherry-picking ?

I think we need to decide this rather soon .. since I'll start cherry-picking some changes tomorrow and I'll need to open 'release' branch for pushing.

IMVVVHO, we should not cherry-pick and just (re)push to release branch, but I do support the decisions we make and I do follow them.

Cheers,
--
Sergio Ahumada
Release Engineer - Digia, Qt