Two heads after pull of tl/jdk and jdk8/jdk

[Weijun Wang]

On 08/18/2011 05:04 PM, Charles Lee wrote:
> On 08/18/2011 03:23 AM, Sebastian Sickelmann wrote:
>> Hi,
>>
>> after pulling from both sources
>> http://hg.openjdk.java.net/jdk8/tl/jdk/
>> http://hg.openjdk.java.net/jdk8/jdk8/jdk/
>>
>> i see that i got two heads.
>>
>> Is it because in all the other repositorys jdk8/*/jdk there are also
>> many changes to the jdk-sub-repo?

Different teams work on their own sub repos, and an integrator syncs 
them with the main repo when a jdk build is to be published (promoted). 
Multiple heads might appear during the integration and the integrator 
does the merges.

>> Should i worry about these changes and merge it? Or is there an "Merge
>> Inspector" in the jdk8/tl/* who does the job.
>> I think creating a webrev for such a change isn't worth it. And we
>> non-commiters haven't any change to merge those for the public, isn't it?

You should clone from a single repo, either a sub repo, or the main one, 
depending on what you are interested in.

A commiter always clones a sub repo of his own team, because normal 
changesets (not a merge) can only be pushed into a sub repo (thru its gate).

-Max


>>
>> -- Sebastian
> Hi Sebastian,
> http://hg.openjdk.java.net/jdk8/tl is for "tools and language"
> http://hg.openjdk.java.net/jdk8/jdk8 is for publish openjdk8.
>
> Changes in the "tools and language" will be merged in the "publish
> openjdk8"
>
>