Op 7-10-2011 0:15, Lars Gullik Bjønnes schreef:
Before I try, I'd like to do the conversion proper and see if everybody is comfortable with the result.
Btw. Are still interest in me doing this? (gitolite and svn -> git conversion)
Gitolite seems to work perfect for what we need, so I would say yes.
| Another thing I don't want is that we have to depend on one person to do | the merging. If this person does not have time for a while, other people | might | get angry and demotivated if their features are not pulled into trunk-devel | for | some time. That's why I proposed that people with svn commit rights would | be able to push themselves and merge their branch into trunk-devel. A script | will then easily pick up the branch and will put it in the process which | will | eventually get it to merge into trunk-stable. Note that the general (distributed) git model is a model where every developers have two trees: one private one, and one public one. The devloper uses the private one for personal development, branches etc. And uses the public one for sharing his work. (a developer can of course orgainize his work in multiple repos.) In a project there will be a (one or more) special repos. Being the pristine upstream repo, the master that all others are originally based on.
My opinion is that everything that we would now commit in the svn repo, could be in the 'pristine upstream repo'. If developers want to have their own repo for sharing his work is just an extra possibility.
I think I must revise some of my thoughts. I think that you should intially do deviate too much from the svn model that your are familiar with, and rather enhance that model when you get experience with git and begin to see benefits and opurtunities in useing a more "gitty" model. Anyhow, I can work on getting this to happen.
I would really like to see this to happen. The most important thing in the "gitty" model is that people can commit 'freely' like we do now, but that the 'feature' only gets merged into the real trunk in a second phase. In the time between, the commits can be shaped, merged, fixed, tested and so forth.
Do you want to cooperate in organizing this. There must be someone else besides you managing the git repo, otherwise we continuously have to wait until you come around again.
Vincent
