the src (hotspot) tree in graal

[Deneau, Tom]

Gilles --

When you say "we are not merging any more for now", does that mean graal will be staying at hs25-b63 for a while?

-- Tom

-----Original Message-----
From: gilwooden at gmail.com [mailto:gilwooden at gmail.com] On Behalf Of Gilles Duboscq
Sent: Thursday, July 03, 2014 4:08 AM
To: Deneau, Tom
Cc: graal-dev at openjdk.java.net
Subject: Re: the src (hotspot) tree in graal

Our current upstream repo is hsx/hsx25. The revision we're based on is
5f07ec8bb982 which is indeed hs25-b63. This revision also exists in jdk8/jdk8/hotspot.

Up until last December we just merged the upstream repository regularly without any special difficulty. At times we also try to minimize the diff to make this task easier.
We are not merging any more for now.

Be careful when looking at the history through mercurial: there are two merges that were done later (with jdk9) that were "reverted".
Since you can't really revert a merge as far as mercurial is concerned, it may get a little confused.

-Gilles

On Wed, Jul 2, 2014 at 11:21 PM, Tom Deneau <tom.deneau at amd.com> wrote:
> I noticed when I run hg tags on graal, the most recent hs tag in there 
> is hs25-b63
>
> So if I wanted to find all the hotspot tree diffs introduced in graal , would it be correct to diff vs. jdk8/jdk8/hotspot, tag hs25-63?
>
> How does the graal team manage the src (hotspot) tree when there is a new hotspot build?
> Is there a mercurial repository somewhere which contains the graal hotspot on a branch from the regular hotspot to help with merges?
>
> -- Tom
>
>