Re: [PATCH] Minor Ada task cleanups

Tom Tromey
2019-02-19T13:13:42Z

>>>>> "Joel" == Joel Brobecker <brobecker@adacore.com> writes:

Joel> One question independent of this patch first: I am wondering - how
Joel> do you deal with submissions that you want to "git am" but have
Joel> a ChangeLog patch in it that cause a merge failure?

This was a bug in my script to send email -- it failed to remove the
ChangeLog hunk when sending from a git worktree. I've just fixed it.

You can see my scripts here: https://github.com/tromey/git-gnu-changelog

For the case of applying a patch, I use git-merge-changelog, from
gnulib. Fedora packages it so you can just "dnf install" it. This
avoids most problems arising from applying patches with ChangeLogs (I
think I had one problem in the last few years).

Mark once wrote up some instructions that I still follow when setting
this up:

https://gnu.wildebeest.org/blog/mjw/2012/03/16/automagically-merging-changelog-files-with-mercurial-or-git/

Tom