Confirmed users
508
edits
Mozilla.com/Workflow-improvements: Difference between revisions
Mozilla.com/Workflow-improvements (view source)
Revision as of 07:53, 14 January 2011
, 14 January 2011no edit summary
No edit summary |
No edit summary |
||
| Line 99: | Line 99: | ||
The above process describes what would happen with a one-off, so a one-off changes are easily supported. For a release cycle, the developer would merge his/her bugfix branch into master but not push it out. When time comes to publish a release, all it takes is publishing the master branch (an easy git command). | The above process describes what would happen with a one-off, so a one-off changes are easily supported. For a release cycle, the developer would merge his/her bugfix branch into master but not push it out. When time comes to publish a release, all it takes is publishing the master branch (an easy git command). | ||
=== Localizers === | |||
One problem is that localization contributors submit patches through SVN, and it wouldn't be good to tell them to use git. However, [http://www.viget.com/extend/effectively-using-git-with-subversion/ git-svn] lets us pull in commits from SVN where localizations are coming through. | |||
=== Other notes === | === Other notes === | ||
| Line 104: | Line 108: | ||
The above process is just an idea, there are many ways we could use git. We could publish commits on the master branch in the centralized server, but then we need a separate process to support one-offs because you can't publish only part of a branch. | The above process is just an idea, there are many ways we could use git. We could publish commits on the master branch in the centralized server, but then we need a separate process to support one-offs because you can't publish only part of a branch. | ||
git-svn is a great tool which comes with git. It's a bridge between git and SVN that works very well; it actually converts git commits to SVN revisions and back. I've been using it to work with the mozilla.com codebase. We can use it to convert the whole SVN repository into git. | [http://www.viget.com/extend/effectively-using-git-with-subversion/ git-svn] is a great tool which comes with git. It's a bridge between git and SVN that works very well; it actually converts git commits to SVN revisions and back. I've been using it to work with the mozilla.com codebase. We can use it to convert the whole SVN repository into git. | ||
The biggest obstacle will be the learning curve for people who don't know git and making the transition easy, if we did this. I think we'd gain a lot of benefits though. | The biggest obstacle will be the learning curve for people who don't know git and making the transition easy, if we did this. I think we'd gain a lot of benefits though. | ||