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

[Lindenmaier, Goetz]

Hi,

I added a short section "What to do with changes depending on each other?" in https://wiki.openjdk.java.net/display/JDKUpdates/How+to+contribute+a+fix

For other backporting issues there is now also https://openjdk.java.net/guide/, but dependent pull requests
are not yet covered there.

Best regards,
  Goetz.

> -----Original Message-----
> From: jdk-updates-dev <jdk-updates-dev-retn at openjdk.java.net> On
> Behalf Of Andrew Leonard
> Sent: Tuesday, February 15, 2022 11:57 AM
> To: sgehwolf <sgehwolf at redhat.com>
> Cc: Aleksey Shipilev <shade at redhat.com>; jdk-updates-
> dev at openjdk.java.net
> Subject: Re: How do I backport two jdk->jdk17u-dev commits together?
> 
> Thanks Severin,
> yes, makes sense, cheers
> Andrew
> 
> On Tue, Feb 15, 2022 at 10:43 AM Severin Gehwolf <sgehwolf at redhat.com>
> wrote:
> 
> > On Tue, 2022-02-15 at 10:00 +0000, Andrew Leonard wrote:
> > > Ideally I want to put two commits from jdk into 1 backport PR ...
> >
> > We prefer backports to be done the same way as they got integrated in
> > JDK head. So there is no great way to do this. More below.
> >
> > > 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 ?
> > > >
> >
> > Backport the first fix, and also backport the follow-up fix. Test them
> > together (locally). Eventually they'll get integrated at the same time
> > (or shortly one after another). Testing wise it would be largely
> > invisible. Using the dependent PR feature for this is a nice to have.
> >
> > Maintainers would (usually) insist on getting follow-up fixes
> > backported too and making approvals conditional on the follow-up fix
> > getting integrated at the same time.
> >
> > Hope that makes sense.
> >
> > Thanks,
> > Severin
> >
> >