Update on JDK 10 repo consolidation; third generation prototype coming soon, September 2017 still the target

[joe darcy]

Hi David,


On 8/31/2017 6:27 PM, David Holmes wrote:
> Hi Joe,
>
> On 1/09/2017 11:12 AM, joe darcy wrote:
>> An update on the repo consolidation.
>>
>>
>>

[snip]

>>
>> The current plan for the top-level JDK 10 forests is:
>>
>> * jdk10/jdk10 -- pre-consolidated version archived and ready-only to 
>> allow URL links from JBS to continue to function
>> * jdk10/master -- new consolidated master repository hosted the 
>> sources previously spread out in jdk, langtools, hotspot, etc.
>> * jdk10/client -- old "client" forest deleted, new "client" repo 
>> created as a child of the consolidated master
>> * jdk10/hotspot -- old "hotspot" forest deleted, new "hotspot" repo 
>> created as a child of the consolidated master
>
> The existing forest is jdk10/hs not jdk10/hotspot, but renaming the 
> new repo as "hotspot" might be a good idea.

Right I meant to write "jdk10/hs" above rather than "jdk10/hotspot".

It would certainly be possible to archive the jdk10/hs forest and 
restart development afresh in a consolidated jdk10/hotspot repo. I don't 
oppose that, but I don't think it is strictly necessary either.


>
>> An implication of the above is that existing children of the 
>> pre-consolidated forest will no longer be directly usable for doing 
>> pushes. New clones of the appropriate consolidated repo will need to 
>> be used instead once the repos are opened for development.
>
> Any tools for making this migration easier? I personally have 6 clones 
> I'd need to migrate.

One of the infra-related items planned to be worked on is a patch 
conversion script analogous to (and perhaps sharing implementation with) 
the shuffle script used for the Jigsaw changes.

>
> How do the project repos move across to the new consolidated form? 
> Will we lose all the changeset history?
>

I recommend project forests sync up with the last pre-consolidated JDK 
10, extract the patches from the changesets, and then reapply the 
changesets to a new consolidated baseline of the project forest.

HTH,

-Joe