[IMPORTANT] ChangeLog related changes

[Thomas Koenig]

Hi Jakub,

> On Tue, May 26, 2020 at 12:42:41PM +0200, Thomas Koenig wrote:

>> So, two questions:
>>
>> - How do I get my gcc-10 branch back into a consistent state?

That works, thanks.

> git reset --hard origin/releases/gcc-10
> should do it (if you want to throw all your local changes).
> 
>> - How are backports supposed to be handled using the new scripts?
> 
> When cherry-picking or otherwise backporting a change which changed the
> ChangeLog files, one needs to remove the ChangeLog changes from that commit,
> e.g.
> git diff > /tmp/P
> for i in `lsdiff /tmp/P | grep ChangeLog`; do filterdiff -i $i /tmp/P; done | patch -p1 -R
> git commit -a --amend

I tried that, with the slight variation of doing "git diff HEAD~1 > /tmp/P"
as the first command (and installing lsdiff), and it seems I have
successfully pushed r10-8187-g3633bc27f5925394ccc5dd56bb1c65b4d88b42c0 .

Thanks!

Just to let other people know that this works :-)

Regards

	Thomas