RFR: Upstream merge jdk/jdk -> shenandoah/jdk 2018-07-12

[Aleksey Shipilev]

On 07/12/2018 01:46 PM, Aleksey Shipilev wrote:
> On 07/12/2018 01:44 PM, Roman Kennke wrote:
>> Tag jdk-12+2 arrived. Lets merge up to there.
>>
>> http://cr.openjdk.java.net/~rkennke/jdk-upstream-merge-2018-07-12/outgoing.txt
> 
> OK!

Wait a minute, this is not a merge "up to jdk-12+2"! It is a merge to "added tag" changeset". So,
shenandoah-jdk-12+2 includes upstream changes past jdk-12+2. I think you really need to only pull
too jdk-12+2, strip the excess changesets, and then merge.


changeset:   51516:5c3c53703b8b
user:        jwilhelm
date:        Thu Jul 12 12:22:54 2018 +0200
summary:     Added tag jdk-12+2 for changeset 69b438908512

changeset:   51517:12540eda5e02
tag:         shenandoah-jdk-12+2
parent:      51412:9633a0bbf868
parent:      51516:5c3c53703b8b
user:        rkennke
date:        Thu Jul 12 12:49:58 2018 +0200
summary:     Merge

changeset:   51518:383047e89f06
tag:         tip
user:        rkennke
date:        Thu Jul 12 12:50:16 2018 +0200
summary:     Added tag shenandoah-jdk-12+2 for changeset 12540eda5e02

-Aleksey