[Bf-committers] Let us switch to git, pretty please

Fri May 27 08:59:14 CEST 2011

Developers (especially those we don't have commit right to current SVN)
who wish can start working by cloning from the master branch of
blender.git at gitorious.org/blenderprojects. Whenever they feel they
have a feature ready in a feature branch in their personal clone they
can prepare a patch and send it to codereview.appspot.com. Once accepted
the patch can be applied to SVN trunk on svn.blender.org. If we stay
with SVN, the same procedure still can apply for new features: create
patch when you're done, send to codereview, wait for LGTM, commit.

Whatever we choose, note that we'll very likely always have a select
group of developers who have write access (push access or whatever the
lingo for selected SCM is). Because of this I don't see it very useful
to change the SCM _on svn.blender.org_. We can use gitorious.org mirror,
developers can use svn+git, git-svn or any other way of doing Their
Thing locally, while maintaining a commit history. Using Git or Hg or
any other tool will not lessen the need for codereview, which is the
real bottleneck here.

So: gitorious.org/blenderprojects/blender.git for feature branches -
people can make personal clones, create N feature branches, prepare
patch and dance the review dance.

In the end we still have to handle merges and resolve conflicts, this
way it doesn't fall only to the designated person and we can have
codereview more closely involved in the entire development process.

Why blender.git? As Sergey already points out fullblender.git is *huge*,
close to TWO gigabytes worth of clone. That is just not nice, and will
need a lot of memory on pulls and pushes with changes in lib/* (or
you'll have to be very patient on machines with not that much RAM, very
patient - and hope the packing doesn't crash out).

I've used Git on Windows for a long time now and I must say that the
portable install of msys Git is good. The best tools IMO are gitk and
git gui (picking single lines from unstaged changes to commit is pretty
awesome), TortoiseGit somehow is very obscure to use.

/Nathan

On 27.5.2011 6:29, Sergey I. Sharybin wrote:
>   Hi,
> 
> I'm not sure switching the whole repo to git is a nice idea. Last time 
> i've checked this it was very painful to work with libs/ repo cloned 
> with git -- simple `git status` used to work ages. Maybe this is because 
> of plenty of binary files, not sure. And size of that local cloned repo 
> was also incredible big -- several gigabutes, iirc.
> 
> Git for codebase works really nice when you've got plenty of branches -- 
> no pain with all this re-branching and so. Simple `git rebase` and here 
> we go. There's also advantage for releases -- tagging happens much nicer 
> with git.
> 
> It'll be also more useful for pre-realse periods while codebase is 
> frozen -- developers could still commit features to the development 
> branch, but they wouldn't go to master.
> 
> About clients i could say that git on linux works nice, msysgit works 
> fine for windows. There's also TortoiseGIT. I haven't used it much, but 
> it worked also nice. But i have to admit, that some firends of mine had 
> some occasional troubles with it.
> 
> P.S. as one more disadvantage, we'll be unable to have that r<number> in 
> splash screen. It could be short commit SHA, but not sure it'll be useful.
> 
> Tom M wrote:
>> It was discussed a bit yesterday on irc as Jason was updating his
>> sculpt branch to head that it would haven been much less pain with GIT
>> potentially.
>>
>> Brecht and Ideasman and other core maintainers what are your views on
>> moving to git or mercury?
>>
>> Ultimately the decision will be up to Ton of course, but would be good
>> to get a straw poll on sentiment for it.
>>
>> LetterRip
>> _______________________________________________
>> Bf-committers mailing list
>> Bf-committers at blender.org
>> http://lists.blender.org/mailman/listinfo/bf-committers
>>
> 
> 

- -- 
Nathan Letwory
Blender Foundation | Letwory Interactive
http://www.blender.org | http://www.letworyinteractive.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJN30vBAAoJEKtfN7KsE0TtV9cH/i2FHyRYykCs6/zoytzTNzmA
7oHEurl8AIvzDBUOyV5Q2WV6Rr6k23c3ZNcFj9Lf1S9346Cgz3FPV0zIEtm+wBxe
lRbRC7KJESfeKStKK+As/nelGCV5CeKrGE9Qufxr+cw+Gssy/ZXB3x7Cv9BWGqF2
TJepWwAsNBvpKal7qYs69wSKBNHQ2GX267dQ5ZiDwRZhOmZIdMimvJJygW0diBpc
ip15Dedpo29qm/7WIQEhk/t+nI+0WbHE+Z80KOuIJo4C6ZbeZoHXr/hsOjVHEvx8
qaA+BNeDfYD6IHrfpZX/TurFBXq9RdSJqTNP8jiE8g6nPrsEt0fX2E4shOA450E=
=g+C2
-----END PGP SIGNATURE-----