Pushing changes for Update 2

Greg Lewis glewis at eyesbeyond.com
Sun Mar 4 22:55:37 PST 2012

G'day all,

I've taken some time to get my bsd-port local repo sync'ed up with the
jdk7u2 repo.  I'd like to push what I have up into the main repo, but
thought it was worth talking over before I do that since I'm not a
mercurial guru.  Here is what I've done so far:

1. Pull from the jdk7u2 repo.
2. Merged and committed (this warned about creating an extra head, but I
   went ahead since this seemed reasonable given I was pulling from a new
3. Merged Linux specific changes into the BSD specific code, fixed some
   merge botches and committed that.

The result compiles on FreeBSD/i386 and runs a few examples that I tried.
As I said, I'd like to push this up to the main repo now.  Some open

. Should we tag or branch the current repo first?
. Will pushing cause any problem for anyone else?
. Has anyone got time to test compile it on other platforms first (or is
  the best thing to just push and let people test that way)?
. Should we branch once we've waited for a week or so and use head for
  jdk7u4 merging and let any bug fixes go into a jdk7u2 branch?
. Anything I'm missing?

I expect the jdk7u4 merge to be a lot bigger since we'll need to carefully
integrate with the Mac OS X support that is going in.

Greg Lewis                          Email   : glewis at eyesbeyond.com
Eyes Beyond                         Web     : http://www.eyesbeyond.com
Information Technology              FreeBSD : glewis at FreeBSD.org

More information about the bsd-port-dev mailing list