Short HOWTO on using git for Samba development

Gerald (Jerry) Carter jerry at samba.org
Mon Jun 25 14:39:06 GMT 2007


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Simo,

It's a little mind bending to swap from the centralized
workflow to a distributed workflow.  I'm not claiming to
have figured it all out, but see comments below.

> The only problem I see with git/bzr as the main tree is 
> that it seem to introduce a gatekeeper to the "official"
> tree forcing all people to send around patches instead of
> just committing.

The beauty is that there is no master tree. Everyone just
has their own tree.  Currently the svn model force feeds
changes to developers everytime you run "svn up".  The upside
is that there is an easy way to run top of tree.  The
downside is that people too often use "svn commit" as the
save button.  This is basically what svk tried to solve.

Using a DSCM forces individual developers to pull others
trees (which can be automated via cron jobs).  But by the
time the patches end up in the stable tree, they should
be well tested and ready to go.

The other advantage of using something like git is that
branch maintenance is reduced as individuals no longer
have to checkin to multiple branches.  The SAMBA_3_0_*
branches we have in svn will simply go away.  Of course,
the patch release model doesn't go away, but the responsibility
shifts.

> This work flow model is ok if a few people work on a 
> very isolated part of a tree, or on some experimental
> features, but if you need to collaborate it may
> make things more annoying.

I don't see any change here.  Instead of "svn commit && svn up",
you have "git commit && git pull".  This would also allow for
more of a maintainer model than we have now as well.

Anyways, I'm not proposing any changes at this time.  I plan
to spend the next couple ofmonths using git for daily
development.  If things go well, there's a string possibility
I will bring it up for discussion around the CIFS workshop
in Sept.





cheers, jerry
=====================================================================
Samba                                    ------- http://www.samba.org
Centeris                         -----------  http://www.centeris.com
"What man is a man who does not make the world better?"      --Balian
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGf9OKIR7qMdg1EfYRAqe5AKC0q5SCX89tKAIHNbH1a6NoPDjrzQCfYWGu
o5dfPdJYzR8mMf2mAAeJUWc=
=aNvs
-----END PGP SIGNATURE-----


More information about the samba-technical mailing list