How do I backport two jdk->jdk17u-dev commits together?

[Andrew Leonard]

Ideally I want to put two commits from jdk into 1 backport PR ...

On Tue, Feb 15, 2022 at 9:58 AM Andrew Leonard <anleonar at redhat.com> wrote:

> Thank Aleksey,
> If I understand that correctly, i'm not sure that will quite work for my
> scenario, as my 1st PR is not dependent on the 2nd PR, the 2nd PR is a fix
> to a problem found in the 1st PR.
> So essentially:
> PR1: added some code...
> PR2: fixed a problem with the code added in PR1
> So PR2 depends on PR1, but ideally I don't want to integrate PR1 before
> PR2, but it would not harm to do so it just wouldn't fully function until
> PR2 is also backported.
> So summing that all up effectively for correct functioning PR1 depends on
> PR2 and PR2 depends on PR1 (gosh hope that makes sense!)
>
> I feel as though I should do PR1 but apply it manually including the PR2
> fix, ie.bundle both into one backport PR ?
>
> Thanks
> Andrew
>
>
> On Tue, Feb 15, 2022 at 9:38 AM Aleksey Shipilev <shade at redhat.com> wrote:
>
>> On 2/15/22 12:24, Andrew Leonard wrote:
>> > I have 2 jdk commits I want to backport to jdk17u-dev that are
>> dependent on
>> > each other, one fixes an issue in the first one.
>> > How do I achieve that with the Skara commands?
>> > The 2nd one will not backport cleanly without the first as it modifies
>> code
>> > from the 1st, so they sort of need doing together?
>> > Or do I just do the 1st, then do the 2nd separately.
>>
>> Like this:
>>    https://mail.openjdk.java.net/pipermail/jdk-dev/2021-March/005232.html
>>
>> --
>> Thanks,
>> -Aleksey
>>
>>