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

[Ziller Eike]

> 
> ________________________________________
> From: releasing-bounces+eike.ziller=digia.com at qt-project.org [releasing-bounces+eike.ziller=digia.com at qt-project.org] on behalf of Koehne Kai [Kai.Koehne at digia.com]
> Sent: 14 December 2012 09:45
> To: Buddenhagen Oswald; Knoll Lars; Thiago Macieira
> Cc: <releasing at qt-project.org>
> Subject: Re: [Releasing] State of Qt 5.0.0 wk 50        &       Meeting minutes:        release team meeting 12.12.2012
> 
> > -----Original Message-----
> > From: releasing-bounces+kai.koehne=digia.com at qt-project.org
> > [mailto:releasing-bounces+kai.koehne=digia.com at qt-project.org] On Behalf
> > Of Buddenhagen Oswald
> > Sent: Friday, December 14, 2012 12:11 AM
> > To: Knoll Lars; Thiago Macieira
> > Cc: <releasing at qt-project.org>
> > Subject: Re: [Releasing] State of Qt 5.0.0 wk 50 & Meeting minutes: release
> > team meeting 12.12.2012
> >
> > [...]
> > one can argue that a single merge of release back to stable after the release
> > looks easier than *potentially* several forward merges.
> > but then, cherry-picks (especially if somebody forgets the -x) also *do* make
> > the history more complicated once they get merged back. and we will merge
> > back, because thiago will insist on having the tags being visible on stable
> > and dev.
> 
> What do you mean by that? Git tags aren't bound to a specific branch, and I don't see a reason why the exact SHA of a release must be in the history of either stable or dev.

If you don't merge release into stable, the release tag is not "reachable" from stable or dev.
Meaning that things like "git describe" and probably other things (bisecting between release tag and current stable/dev?) do not work as expected.

--
Eike Ziller
Senior Software Developer

Digia Germany GmbH
Rudower Chaussee 13, 12489 D-Berlin
Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B,
Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius