From: Giuseppe Bilotta Date: 2009-01-07T22:04:25+09:00 Subject: [ruby-core:21190] Re: Happy new year and... moving Ruby development to Git? Hello, On Wed, Jan 7, 2009 at 1:59 AM, Yukihiro Matsumoto wrote: > Hi, > > In message "Re: [ruby-core:21165] Re: Happy new year and... moving Ruby development to Git?" > on Tue, 6 Jan 2009 18:29:44 +0900, Sylvain Joyeux writes: > > |This is mainly because non-trivial patches (and even trivial ones) tend > |to stay quite long in the bug tracker. Which means that you basically > |have, as a non-committer, to update your patch over and over again to > |the newest HEAD. I did that with svn, it is horrible (you have to do it > |by hand). I do that now with git and it works like a charm (thanks to > |rebase). > > As far as I believe issues and patches posted Redmine need not to > update to the latest. The committers will do. Most of left out > changes are just posted to the list. Of course, git makes the work easier for the committers too (git patches are often able to automatically resolve conflicts doing the appropriate three-way merges). And the patch author gets the benefit of his or her name in the log ;-) > |Another thing: maintaining the ChangeLog file. This thing looks very > |stupid, and makes merging horrible (you basically always have a conflict > |on ChangeLog, for obvious reasons). I thought first that it was a > |workaround from the good'ol days of CVS and even started to write a > |script that would generate it. Then I realized that it was not doable > |with SVN since there are no merges. Stupid. > > We have a tool to do the ChangeLog merge, so let us do the merge, just > post the ChangeLog entry for the patch. With git, the changelog can be easily created automatically. By the way, are these tools (such as the ChangeLog merge tool you mentioned) available somewhere? > None the less, we could prepare the git repository synchronized with > the central repository. Yugui already has one anyway. There are also a couple of git mirrors of the svn repository on github. It would be nice to have e.g. Yugui's repo (or any other) elected to be the official mirror and pubished somewhere (possibly on github and/or gitorious too), with a link from http://www.ruby-lang.org/en/community/ruby-core/ (by the way, http://www.ruby-lang.org/en/downloads/ still mentions CVS instead of SVN) (by the way #2, http://kitenet.net/~joey/rfc/rel-vcs/ proposes a microformat to add to webpages the reference repositories, you might want to consider adding it) -- Giuseppe "Oblomov" Bilotta