[Development] Proposal: New branch model

Ville Voutilainen ville.voutilainen at gmail.com
Thu Jan 24 14:48:59 CET 2019


On Thu, 24 Jan 2019 at 15:47, Edward Welbourne <edward.welbourne at qt.io> wrote:
>
> Allan Sandfeld Jensen (24 January 2019 14:35)
> > We can't integrate multiple changes to the same branch in parellel.
>
> I was under the impression that was exactly what we do.
>
> When I press Stage, my change gets cherry-picked to a little branch that
> gerrit is building, along with (i.e. in parallel with) various other
> changes staged around the same time.  When Coin next has its hands free,
> it starts a new integration of that staging branch (and a fresh staging
> branch is started).  If the integration fails, the message at the end of
> the comment on my review tells me the list of other commits that were in
> the same integration branch.
>
> Or have I misunderstood what you're saying ?

That's not "in parallel". :)



More information about the Development mailing list