Hi Brian, On Tue, May 31, 2016 at 09:56:01AM -0700, Brian Gardner wrote: > Hey Greg, I saw you merged jdk9 last night. Was that a merge with the tip of > http://hg.openjdk.java.net/jdk9/jdk9 <http://hg.openjdk.java.net/jdk9/jdk9> ? > I???m trying to figure out how > http://hg.openjdk.java.net/jdk9/jdk9/hotspot/rev/aa11081b8307 > <http://hg.openjdk.java.net/jdk9/jdk9/hotspot/rev/aa11081b8307> was dealt > with since it likely caused a conflict. It???s a bit hard to follow the > emails that were generated from the merge. We should be able to backout > 7e97a2af571a and 6d0bb4a88d8d, because change set aa11081b8307 replaces both > of them. > > On another note I have an Oracle account setup now and can help. Just let me > know what you???d like me to do.
It's so far a partial merge. I tried to merge completely up to tip, but found resolving the conflicts to be a pain, so I decided to step back and do it build by build. So far that has been easier, but it isn't complete. I'm currently at the jdk-9+111 tag and about to start the merge for jdk9-+112. I think in terms of the merge, it is probably not worth trying to coordinate that. It also makes things a bit of a moving target. However, it is probably still worth trying to get the internal test suites running so that we can see how the test cases look on BSD. Other things worth doing: - Get the JCK test suite downloaded and set up and running. Presumably this is more thorough than the internal tests and we'll need to pass it if we ever want to merge into mainline. - Go over the openjdk8 changes and see that they all got into openjdk9. -- Greg Lewis Email : gle...@eyesbeyond.com Eyes Beyond Web : http://www.eyesbeyond.com Information Technology FreeBSD : gle...@freebsd.org
