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

[Oswald Buddenhagen]

On Thu, Dec 13, 2012 at 04:41:04PM +0100, Simon Hausmann wrote:
> On Thursday, December 13, 2012 04:28:47 PM Oswald Buddenhagen wrote:
> > On Wed, Dec 12, 2012 at 03:04:42PM +0000, Tanilkan Sinan wrote:
> > > _Branching_
> > > Once rc 2 is out, Sergio will create release branches. If there are
> > > changes needed after rc 2, they need to go trough Sergio (who will
> > > cherry pick them from stable).
> > 
> > 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?
> 
yes. together with the merges (and there will be two git merges per
logical merge due to gerrit stupidity), this will make an utterly
unreadable history.

> It seems to me that we're trading developer convenience (push changes to 
> stable, release dudes selectively pick) against git history hygiene.
> 
considering that we are talking about P0/P1 issues, people should be
conscious enough about their target branch. i don't see how doing it
right would add any inconvenience.

also, i found that it's not even possible to push for/release, which
makes no sense at all (unless release is not CI-checked, which would be
beyond the pale) - that way, i'm *forced* to make a mess of the history.