Re: [Bug binutils/23919] bfd doesn't handle ELF compressed data alignment

[Nick Clifton]

Hi Mark,

>>   One very minor point - in the future, would you mind providing the
>>   ChangeLog entries as plain text, rather than a context diff ?  It

> OK, I will in the future.
> Do you have some script that helps you handle separate ChangeLog entries?

Nope. :-(

> 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/

Fantastic - thanks - I have been looking for something like that for ages.
Please consider my request for plain text changelog entries withdrawn!

Cheers
  Nick