OK, I went ahead and submitted a change for branches/legals to back out all non-comment changes from r2988:2989. This brings Calendar back to life and may improve our lives in other ways as well.

Merging r2988:2989 and r3014 to branches/4.0b1 will also require merging this change.

jim

On Dec 11, 2006, at 11:54 PM, Jim Grandy wrote:

No, that's not it. I see the error in calendar as well.

jim

On Dec 11, 2006, at 11:01 PM, Jim Grandy wrote:

I think you need to re-merge 3014 after merging 2987:2989 -- svn is just doing a textual three-way merge, it doesn't know about history.

I'm putting that together now.

jim

On Dec 11, 2006, at 6:16 PM, Benjamin Shine wrote:


The changes to the lfc seem to have merged badly with the changes to 4.0b1 since 2987:2989. Sorry, Jim, but... nope, not ready for integration yet.

I see the "$5 has no properties" error at
http://localhost:8080/4.0b1/laszlo-explorer/index.jsp?lzr=dhtml
and laszlo-explorer in dhtml does not come up.

3014 is already in 4.0b1.

-ben

On Dec 11, 2006, at 1:32 PM, Jim Grandy wrote:

This suite of changes constitutes the bulk of the work to bring js2doc up to feature complete status.

Risk: pretty low, we've already hammered this quite hard on branches/legals. We've also resolved (and integrated to 4.0b1) the issue with linux-builder hanging when building docs on Java5.

jim




Reply via email to