[11u] Announcement: Switch to Git/Github for 11.0.13 release cycle

[Langer, Christoph]

Hi,

I just tried it myself: https://github.com/openjdk/jdk16u/pull/94

It was actually my first git backport where something had to be resolved. And this is what I did:

1. Went to my personal fork of jdk16u
2. git checkout -b 8259662
3. git backport --from=openjdk/jdk 63f8fc87cdf3edb828474bb4954b76721ba8f9e5
-> the backport attempted the cherry-pick and since there were conflicts it stopped in error.
4. I resolved the conflicts
5. I wondered what to do now. git cherry-pick --continue wasn't possible. git commit came up with the exact original commit message. In the Wiki instructions I however read that it should usually go like git commit -m 'Backport <original hash>'...
6. After some thinking I decided for git commit -m "Backport 63f8fc87cdf3edb828474bb4954b76721ba8f9e5"
6. I created the pr with git pr create --publish

So, @erik.helin and @robin.westberg, I have some feedback: I think git backport should provide some git backport --continue. And that should finish the cherry-pick and set the correct commit message in the form of "Backport ..." to be recognized by the bots. Is that possible?
Otherwise there should at least be a hint like "After resolving, finish with git commit -m 'Backport <hash>'". What do you think?

Paul, you can try it yourself once again, if you want. I would close my PR then. Or you can just review it, either way is fine for me ��

Best regards
Christoph

> -----Original Message-----
> From: Hohensee, Paul <hohensee at amazon.com>
> Sent: Freitag, 26. März 2021 22:08
> To: Langer, Christoph <christoph.langer at sap.com>; jdk-updates-
> dev at openjdk.java.net
> Cc: skara-dev at openjdk.java.net; erik.helin <erik.helin at oracle.com>;
> robin.westberg <robin.westberg at oracle.com>; aph <aph at redhat.com>;
> sgehwolf <sgehwolf at redhat.com>; Lindenmaier, Goetz
> <goetz.lindenmaier at sap.com>
> Subject: Re: [11u] Announcement: Switch to Git/Github for 11.0.13 release
> cycle
> 
> I just tried to follow the directions on the wiki.
> 
> Against what repo should the backport be done, jdk16u or a personal fork of
> jdk16u? Based on how jdk commits work, I'd say the latter, but it's difficult
> for me to tell.
> 
> The commit command for use after resolving conflicts seems like it should
> use "Backport-of" rather than "Backport".
> 
> Thanks,
> Paul
> 
> -----Original Message-----
> From: "Langer, Christoph" <christoph.langer at sap.com>
> Date: Friday, March 26, 2021 at 10:04 AM
> To: "Hohensee, Paul" <hohensee at amazon.com>, "jdk-updates-
> dev at openjdk.java.net" <jdk-updates-dev at openjdk.java.net>
> Cc: "skara-dev at openjdk.java.net" <skara-dev at openjdk.java.net>,
> "erik.helin" <erik.helin at oracle.com>, "robin.westberg"
> <robin.westberg at oracle.com>, Andrew Haley <aph at redhat.com>,
> sgehwolf <sgehwolf at redhat.com>, "Lindenmaier, Goetz"
> <goetz.lindenmaier at sap.com>
> Subject: RE: [11u] Announcement: Switch to Git/Github for 11.0.13 release
> cycle
> 
> Hi,
> 
> there's this: https://wiki.openjdk.java.net/display/SKARA/Backports. Maybe
> it is not quite "final" yet.
> 
> For anybody interested in trying out the Skara backport process, you could
> do backports in 16u, 13u and as of today, I guess 15u, too.
> 
> I'm sure the Skara team is welcoming any feedback ��
> 
> Best regards
> Christoph
> 
> > -----Original Message-----
> > From: Hohensee, Paul <hohensee at amazon.com>
> > Sent: Freitag, 26. März 2021 17:32
> > To: Langer, Christoph <christoph.langer at sap.com>; jdk-updates-
> > dev at openjdk.java.net
> > Cc: skara-dev at openjdk.java.net; erik.helin <erik.helin at oracle.com>;
> > robin.westberg <robin.westberg at oracle.com>; aph <aph at redhat.com>;
> > sgehwolf <sgehwolf at redhat.com>; Lindenmaier, Goetz
> > <goetz.lindenmaier at sap.com>
> > Subject: RE: [11u] Announcement: Switch to Git/Github for 11.0.13 release
> > cycle
> >
> > Is there a wiki (or other source) on the github backport process using Skara
> > tooling?
> >
> > Thanks,
> > Paul
> >
> > -----Original Message-----
> > From: jdk-updates-dev <jdk-updates-dev-retn at openjdk.java.net> on
> > behalf of "Langer, Christoph" <christoph.langer at sap.com>
> > Date: Friday, March 26, 2021 at 1:23 AM
> > To: "jdk-updates-dev at openjdk.java.net" <jdk-updates-
> > dev at openjdk.java.net>
> > Cc: "skara-dev at openjdk.java.net" <skara-dev at openjdk.java.net>, Erik
> > Helin <erik.helin at oracle.com>, Robin Westberg
> > <robin.westberg at oracle.com>, Andrew Haley <aph at redhat.com>,
> Severin
> > Gehwolf <sgehwolf at redhat.com>, "Lindenmaier, Goetz"
> > <goetz.lindenmaier at sap.com>
> > Subject: [11u] Announcement: Switch to Git/Github for 11.0.13 release
> cycle
> >
> > Hi,
> >
> > I'd like to hereby officially announce the transition of OpenJDK 11 Updates
> to
> > Git/Github/Skara with the 11.0.13 update release cycle.
> >
> > After having a call between the 11u maintainers and Skara folks, we agreed
> > to execute upon the initial proposal [0]. So the switch of the jdk11u-dev
> > repository should happen on or around June 2nd and jdk11u will be
> switched
> > on or around August 3rd, as per the 11.0.13 schedule [1].
> >
> > The Skara tooling for backport releases seems to be in good shape already
> > and we think that by the time we start using it in 11u it will be mature
> enough
> > for our purposes.  In the call Erik and Robin showed the tooling for backport
> > releases and they could positively answer the questions that we found to
> be
> > still open from maintainers perspective.
> >
> > The JBS item for the 11u transition is
> > https://bugs.openjdk.java.net/browse/SKARA-935.
> >
> > Best regards
> > Christoph
> >
> > [0] https://mail.openjdk.java.net/pipermail/jdk-updates-dev/2021-
> > February/004934.html
> > [1] https://wiki.openjdk.java.net/display/JDKUpdates/JDK11u
> >
>