Re: Reconsidering the work flow and how the SCM system fits in

[Richard Purdie <rpurdie@rpsys.net>]

On Wed, 2008-03-12 at 21:26 +0100, Leon Woestenberg wrote:
> On Wed, Mar 12, 2008 at 8:00 PM, Koen Kooi
> <koen@dominion.kabel.utwente.nl> wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> >  | http://lists.freedesktop.org/archives/cairo/2006-February/006255.html
> >  |
> >  | His arguments on the (main two) differences strongly favors me to move
> >  | to GIT, not HG.
> >
> >  Actually it shows that hg fits better into the OE way of using a DSCM:
> >  central repo (and mirrors) with distributed developers.
> >
> Quoting Carl: "Namely, it [hg] appears to force a more centralized,
> (or at least, a more strictly hierarchical), model on the development
> process, while git allows a more fully distributed model making it
> easier for users to pull (even speculatively with "fetch") from
> multiple sources, track them in the local repository as separate
> branches and merge when appropriate."
> 
> Carl carefully uses the words "force" and "allows". Git does not
> preclude a central model, whilst still allowing more centralized
> development.

Thanks for posting the link, I've found it very interesting and to me it
shows that I'm not going to like hg :/.

Why? The *big* *big* win with git is the way it deals with branches. I
really can't stress how useful they are and how much they improve the
way you can use the SCM. Good branch support is the major reason I'd
like to see OE switch SCM in the first place.

Whilst I think OE will always have a central master .dev repository I
see a lot of gain from having branches. I would have happily put the
sysroot changes into a branch and likewise the packaged-staging stuff
I'm working on. As it is I'm keeping it locally uncommitted with no
version tracking since I don't really want to play games with monotone.
I've also got the problem that I've found some bugs in bitbake and being
able to make a bitbake branch available might actually be useful at the
moment. 

So I'm now moving to a position of strongly favouring git. 

Whilst I've argued against it in the past I would consider a move of
bitbake from svn to git too.

Cheers,

Richard