RFR: jdk11 upstream merge jdk-11+22

Aleksey Shipilev shade at redhat.com
Thu Jul 12 12:41:56 UTC 2018


On 07/12/2018 02:38 PM, Roman Kennke wrote:
> Tag jdk-11+22 arrived, so let's merge it.
> 
> In order to tag precisely the exact same changeset, I had to do the
> following procedure:
> 
> hg pull -r 9937ef7499dc jdk/jdk11 (the changeset tagged by the tag)
> hg merge
> hg commit -m"Merge"
> hg tag shenandoah-jdk-11+22    (tag the same changeset plus Shenandoah)
> hg pull -r 5bf28fee65c1     (the tagging changeset)
> hg merge
> hg commit -m"Merge"
> 
> Only this way can we tag the same changeset as upstream tag with our own
> merged Shenandoah and also actually see the upstream tags.
> 
> We shall use this procedure for all future upstream merges.
> 
> Testing: tier3_gc_shenandoah
> 
> http://cr.openjdk.java.net/~rkennke/jdk11-upstream-merge-2018-07-12/outgoing.txt

This looks correct, thank you.

-Aleksey



More information about the shenandoah-dev mailing list