On 03/29/2012 09:54 PM, Ivan Maidanski wrote: > Hi Andrew, > > Thank you for the explanation. > > Thu, 29 Mar 2012 18:33:45 +0100 Andrew Haley <a...@redhat.com>: >> 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; > > The plugin is merely a workaround.
I don't understand this comment. The plugin makes git handle ChangeLogs correctly; there are plugins to make it handle other formats correctly, too. > You say "GNU projects have X" Why? ("because" is missing) Because the ChangeLog is useful to have, independently of any particular VCS. > You you put ChangeLog to ignored list and regenerate on tarball > release via git log would it be possible to say the project has > ChangeLog or not? As long as there is a ChangeLog, it doesn't matter at all how it is created, as long as it's correct, complete, and properly formatted. >> In any case, let's not have this mailing list degenerate into "my >> VCS versus yours" flame wars, just like every other list. > > Agree but if there is a choice - augmented pros and cons are > generally welcomed. But I don't think there is a choice. It's too late, so all this discussion is moot. Andrew.