https://sourceware.org/bugzilla/show_bug.cgi?id=23919
--- Comment #4 from Mark Wielaard <mark at klomp dot org> --- (In reply to Nick Clifton from comment #3) > Thanks very much for the bug report, and especially for a patch to fix it! > I have applied the patch, so I hope that this problem is now resolved. Thanks! > One very minor point - in the future, would you mind providing the > ChangeLog entries as plain text, rather than a context diff ? It > did not matter this time, but often the diff will not apply because > the changelog has changed by the time that the patch is applied. OK, I will in the future. Do you have some script that helps you handle separate ChangeLog entries? Note that gnulib contains some helpers for merging ChangeLog entries that I have used somewhat successfully with mercurial and git. They work the other way around though, you explicitly do add the ChangeLog entries in the commit/ChangeLog file, but when a merge action takes place they handle the entry specially. https://gnu.wildebeest.org/blog/mjw/2012/03/16/automagically-merging-changelog-files-with-mercurial-or-git/ -- You are receiving this mail because: You are on the CC list for the bug.
