[Releasing] rethinking the branching scheme

[Thiago Macieira]

Em sex 21 fev 2014, às 23:42:42, Oswald Buddenhagen escreveu:
> yes. the merge is in the critical path of the alpha release. we can't
> avoid it, and it isn't a big deal.
> what makes a world of difference is the merge being in the critical path
> of "branching". the difference between "we got a new branch, but
> otherwise business as usual" and "all integrations are halted for the
> better part of a week". between the start of the release process being
> something that happens mostly in the background, and something that is
> fairly disruptive to the normal flow (and rather stressful for those
> involved) - actually quite the opposite of the intended effect of this
> "simple" branching model.

>From what I understand, the biggest pain is the actual merging. It doesn't 
matter which branches are involved, merging causes trouble. So I'm not 
convinced that changing the branching scheme makes is more sane. It will 
introduce more problems, because then we have 5.x to keep merging into 5.y and 
fixing integration problems for. And as you clearly put it, those merges are 
now in the critical path of making releases.

As long as 5.x isn't frozen for new commits, the proposed branching scheme 
makes the situation worse for people doing merging.

But if it is frozen, then the situation is exactly the same.

-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center