macosx-port relationship to bsd-port: child or fork?

[Mike Swingler]

On Jan 23, 2011, at 9:41 AM, Stephen Bannasch wrote:

> At 9:56 AM -0500 1/12/11, Stephen Bannasch wrote:
> 
>> Is the macosx-port a fork of bsd-port or a derivation? Will macosx-port be regularly merging changes from bsd-port into
>> macosx-port?
>> 
>> About 3 weeks ago bsd-port merged in jdk-b122, while macosx-port is still based off a merge from jdk-b120.
> 
> Since last week glewis at eyesbeyond.com has merged upstream jdk and linux/sun branches into the bsd-port branch several several times and the bsd-port branch now synched with tag: jdk7-b126.
> 
> Who is responsible for this work on the macosx-port branch?
> 
> Will you be duplicating what glewis does in the bsd-port branch or merging changes in the bds-port branch into the macosx-port branch?
> 
> I am wondering because:
> 
> 1) The macosx-port branch is falling further behind jdk7 development.
> 
> 2) There are changes specific specifically made in the bsd-port branch that should be also in the macosx-port branch.

We have (rather, Alex has) just performed a merge from the most recent BSD change sets. We don't have a single person who is responsible for performing periodic merges right now (since we are working on other development at the moment), but we do intend to stay reasonably up to date.

To the more general point, the Mac OS X port is effectively a child of the BSD-port right now, since this is the path of least resistance for us to accept merges. Later, this situation may change as we aim to integrate into the mainline OpenJDK project.

Regards,
Mike Swingler
Java Engineering
Apple Inc.