[IMPORTANT] ChangeLog related changes

[Martin Liška]

On 5/26/20 1:34 PM, Jakub Jelinek via Gcc wrote:
> On Tue, May 26, 2020 at 12:27:59PM +0100, Richard Earnshaw wrote:
>> I haven't investigated in detail, but could we use a merge strategy with
>> the cherry-pick to drop ChangeLog entries?
> 
> If that works, sure.
> Note, when cherry-picking commits from before conversion to git or whenever
> people started to write usable ChangeLog entries in the commit messages,
> one will also need to reconstruct the commit message additions from the
> ChangeLog files.
> 
> 	Jakub
> 

Hi.

There's a script candidate that does git cherry-pick and drops
and ChangeLog changes from both index and conflicting files.

Thoughts?
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: git-backport.py
Type: text/x-python
Size: 2703 bytes
Desc: not available
URL: <https://gcc.gnu.org/pipermail/gcc/attachments/20200526/8403e9a3/attachment.py>