On Fri, Dec 11, 2009 at 6:00 PM, Jim Driscoll <Jim.Driscoll@sun.com> wrote:

On 12/11/09 2:26 PM, Ed Burns wrote:

My plan was to merge the branch back into HEAD and do the work there.

I don't think 2.0 is ready to be the side branch yet.  There's still a lot of work to do there.

Similarly, as Dan notes, some of the changes, like h:inputFile, may possibly be disruptive.

I'll let Ryan chime in - as lead, I'd prefer it be his call.

This is also pending a decision about moving the VCS to some more modern system like mercurial or git - both of which are supported on Kenai. But my understanding is that we'd like to hear Oracle's plans before we commit one way or the other, as well as some indication from GF on which direction they're going as well (last I heard, it was mercurial on Kenai).  We may want to avoid any big juggling till we have that sorted, and that's liable to be 2-3 months away.