[LLVMdev] git

Chris Lattner clattner at apple.com
Sat Jul 23 12:45:52 PDT 2011


On Jul 23, 2011, at 5:37 AM, FlyLanguage wrote:

>>>>    After git, mainline will still be the most important branch for
>>>>    the *project*,
>>>>    but you will work with quite a few branches on parallel.
>>>> 
>>>> 
>>>> Who's mainline? :) Be prepared to assign a super-merger, like Linus,
>>>> to maintain the "mainline".
>>>> 
>>>> The git workflow works really really great, but it does require
>>>> getting rid of mainline thinking. It doesn't exist.
>>> 
>>> I strongly disagree with this. Having a mainline, whether enforced by
>>> the VCS or not, is crucial to our incremental development philosophy.
>>> For example, we need small, incremental patches going into one
>>> mainline branch in order for our buildbots to usefully identify
>>> regressions. We also bisect performance regressions quite a lot, but
>>> if someone goes off and does a bunch of development on a branch and
>>> then lands it in mainline all at once, we'll be completely unable to
>>> pinpoint the source of any regressions from that branch.
>> 
>> Bob is spot on here.
> 
> 
> Yes, but who's mainline? Is the plan to have a centralized repo with a mainline branch that everybody pushes to

This one.

> , or the a linux style model where some person has an official mainline to which he pulls?

Not this one.

This shouldn't be a mysterious concept, our policies are well documented here:
http://llvm.org/docs/DeveloperPolicy.html#policies

-Chris



More information about the llvm-dev mailing list