Automatically generated ChangeLog files - script

[H.J. Lu]

On Mon, May 4, 2020 at 12:24 PM Tobias Burnus <tobias@codesourcery.com> wrote:
>
> On 5/4/20 9:05 PM, Jakub Jelinek via Gcc wrote:
> > On Mon, May 04, 2020 at 08:56:16PM +0200, Martin Liška wrote:
> >> What's missing right now is how will we declare a Backport format.
> >> Can we just use something like: 'Backport from 6607bdd99994c834f92fce924abdaea3405f62dc'?
> > No.  What we should allow is that people just git cherry-pick r11-1234-g123456
> > into a release branch and push it (of course after testing),
> > so we don't want the user to change the commit log in that case.
>
> How does one handle partial backports? I mean those where
> only half of the original patch applies easily to the old
> branch and the other half is simply ignored? This happened
> a couple of times to me, especially when applying a patch
> to the last but one release branch.

You need to resolve conflicts and update commit message with

$ git cherry-pick --continue

-- 
H.J.