2009/8/24 Christian Thalinger <christian.thalin...@sun.com>: > Greg Lewis wrote: >> G'day Christian, >> >> On Fri, Aug 21, 2009 at 04:05:58PM +0200, Christian Thalinger wrote: >>> Hi (mostly Greg)! >>> >>> I wanted to ask at what intervals a merge with upstream is done? I >>> guess it's just a matter of spare time and actually doing it. Maybe I >>> could help with that task, but then I'd need commit rights. >> >> I'd like to do them every time there is a build tag in the main repository, >> but it ends up depending a lot on my available free time (which is very >> low at the moment). >> >> I think it would be great if you wanted to help out with it, I have no >> problems with you getting commit rights. > > Very good. Get me commit rights and I will do the merging :-) > > Btw. what do you think of using Mercurials rebase extension[1]? I think > it would be more straight forward as the base repository would be > exactly the same (no changesets in between) and the BSD changes on top > of it. >
This seems to have worked ok in moving the OpenJDK6 HotSpot repository to a common base with the other HotSpot repositories, but I was under the impression that the BSD repo. was already based on JDK7? As Greg mentions, there are regular updates from JDK7 going into BSD. >> >>> Furthermore it would be nice to integrate some patches to be able to >>> build on Linux and Solaris out-of-the-box (again). This would be very >>> helpful for the MLVM project, as it currently is based on the bsd-port. >> >> That's a definite goal. Our tree needs to still be compilable on Linux >> and Solaris for the BSD changes to get merged into the main tree. I'm >> happy to commit any patches for this. > > OK, I will try to collect them and post them here for review. > > [1] http://mercurial.selenic.com/wiki/RebaseExtension > > -- Christian > > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
