3.0 merge status

[Julian Fitzell]

On Fri, Jan 8, 2010 at 12:02 PM, Nick Ager <nick.ager at gmail.com> wrote:
>
> I reviewed all my merges and discovered I'd lost changes in:
> PRPierFrame>>initialRequest
> PRViewCommand>>initialRequest
> MAOneToManyComponent>>add

Good stuff!

>
> With the corrections in place, Pier appears to working once again. There are a couple of anomalies - the Pier logo doesn't appear on the home screen and I received one walkback while clicking around. I'll investigate these problems later. I've also yet to look at any add-ons including the Pier-Blog.

The logo is broken by the change you committed to
PRViewCommand>>initialRequest:. If I revert that, it shows up. Not
sure why that was done in the 2.8 branch and, if so, whether it is
broken or whether it depends on some other change that hasn't come
over. Perhaps lukas remembers...

I also see that this is broken (it used to work - I think this might
be from the addition of PRFile>>contents?):

http://localhost:8080/pier/environment/style.css

It prints:
-----------
Style.css

#[47 42 32 98 108 117 101 112 114 105 110 ... (and so on)
----------

> I've loaded the code into a fresh seaside3.0a5 image (with updated Gofer) and the code loads cleanly.

I loaded it and made a few corrections to the merge (easier to spot
when I have some memory of what I did before). Seems to more or less
work with the exception of files, as noted above.

Julian