On Thu, Nov 28, 2013 at 09:26:36PM +0400, Andrey Borzenkov wrote: > В Thu, 28 Nov 2013 07:45:00 +0100 > "Vladimir 'phcoder' Serbinenko" <phco...@gmail.com> пишет: > > I don't like the idea of double work to essentially have 2 commit messages. > > But it's possible to remove Changelog file. I'd like to know if any other > > major gnu projects made the move. > > Oh, I did not dare to ask but if you mention it :) > > Yes, ChangeLog is the major source of merge conflicts and makes it > impossible to cleanly cherry-pick patches for package maintenance.
gnulib (which we're already using elsewhere) has a "gitlog-to-changelog" module that allows you to autogenerate ChangeLog; basically we'd move ChangeLog to ChangeLog-2013 and then add a dist-hook that autogenerates everything after that. I quite like that approach, and it's used by major GNU projects such as coreutils and diffutils. -- Colin Watson [cjwat...@ubuntu.com] _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel