llvm dev - Jul 2011 - [LLVMdev] git

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

Just to be up-front, I normally work on very small projects and I am very much a
non-core LLVM developer (I'm the MicroBlaze backend maintainer). However, we
have had success where I work using the git branching model described in [1] and
[2]. There is a git tool named "git-flow" that specifically supports
this model and it seems like it might fit the LLVM development model so I wanted
to point it out in case others had not seen it. Perhaps the more core developers
can comment more on its usefulness in the LLVM ecosystem.

[1] http://nvie.com/posts/a-successful-git-branching-model/
[2] http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/

--
Wesley Peck
University of Kansas
SLDG Laboratory

On Jul 23, 2011, at 3:16 PM, FlyLanguage wrote:
>>> 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
> 
> 
> No mystery, just nice to know which setup llvm will have.
> 
> _______________________________________________
> LLVM Developers mailing list
> LLVMdev at cs.uiuc.edu         http://llvm.cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev