On quinta-feira, 5 de abril de 2012 16.38.41, Oswald Buddenhagen wrote:
> On Thu, Apr 05, 2012 at 10:54:56AM -0300, ext Thiago Macieira wrote:
> > On quinta-feira, 5 de abril de 2012 13.49.40, [email protected]
> >
> > wrote:
> > > Those were local in Simo's machine due to some cherry-picking of not yet
> > > landed changed. I wanted to tag with reviewed an landed changes though
> >
> > Please upload the exact SHA-1 from Simo's machine because those are in the
> > released package now.
> >
> > I recommend the procedure:
> >
> > per-module:
> > 1) git tag -a the *exact* SHA-1 that are found on Simo's machine
> >
> >    if the module does not follow Qt's versioning, tag it as
> >    "qt-v5.0.0-alpha1"
> >    retroactively setting the date too with GIT_COMMITTER_DATE
> >
> > 2) wait for the fixes to land
> > 3) git merge -s ours v5.0.0-alpha1
> > 4) push the merge, approve it, stage it
>
> or just admit the screwup, and silently upload a tar-ball with the
> corrected sha1s, for the sake of not uglifying the git history.

If you can land all the patches into Gerrit without any other patch in-
between, sure.

I'll buy anyone who can do that for all modules all their beers in Berlin.

> and just for good measure, let simo repeat "i will not bypass CI again"
> about a thousand times.

Why? It sounds like this is exactly the proper releasing procedure. It's been
like that since forever.

--
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center
     Intel Sweden AB - Registration Number: 556189-6027
     Knarrarnäsgatan 15, 164 40 Kista, Stockholm, Sweden

Attachment: signature.asc
Description: This is a digitally signed message part.

_______________________________________________
Development mailing list
[email protected]
http://lists.qt-project.org/mailman/listinfo/development

Reply via email to