----- Original Message ----- > On 03/29/2012 06:19 PM, Ivan Maidanski wrote: > > Hi Andrew, > > > > Thu, 29 Mar 2012 17:42:17 +0100 от Andrew Haley <a...@redhat.com>: > >> On 03/29/2012 04:58 PM, Ivan Maidanski wrote: > >>> It would be good to deprecate ChangeLog (used as commit log) as > >>> well. > >> > >> Why? I think this sentence is missing a "because ..." clause. > > > > Sorry for not explaining you how does git merge work. if you don't > > have a special ChangeLog-aware merge driver installed (like > > git-merge-changelog) you would almost always get merge conflicts > > when pulling public modifications into a privately modified > > ChangeLog file (same for rebasing). Every merge conflict requires > > manual handling. If it is decided to move to VCS that simplifies > > parallel development and branch merging, staying with old commit > > policy (relying on ChangeLog) neutralizes that benefits. > > But that's what the git ChangeLog plugin is for. GNU projects have > ChangeLogs; it's up to the VCS to keep up. > > > PS. I was surprised to hear that free Java developers prefer SVN to > > Git. > > So was I. Who said that Java developers prefer SVN to Git? > > > How many free Java developers have been contributing to Classpath > > over the passed 3-4 years? And which of them prefer to stay with > > CVS > > and SVN? > > Well, I vastly prefer SVN to anything I've seen recently because of > its branch handling, but maybe that's only me. In any case, let's > not > have this mailing list degenerate into "my VCS versus yours" flame > wars, just like every other list.
Yes, let's not. I'll just say that from my side, working with individual changesets makes it a lot easier to dig out individual patches, etc. Doing the recent gcj merge with SVN was horrendous compared with the OpenJDK merges I do (though gcc is a much bigger repo) and I think things would be a lot harder if OpenJDK used it. git and mercurial seem pretty much the same to me, the main difference being that mercurial seems to trail git in terms of feature development and git has a usable branch system, rather than the fakery we have to do with mercurial. > > Andrew. > > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07
