6 Jan
2010
6 Jan
'10
8:32 a.m.
On Tue, Jan 5, 2010 at 10:53 PM, Lukas Renggli <renggli(a)gmail.com> wrote:
Normally merging should be really easy, but I
don't know how much
Magritte and Pier changed from the previous version. Also the merging
does not work if the packages got renamed.
In both cases, I pulled platform-specific code out into separate packages
(and had to split up the Tests package into smaller chunks). The main
packages (-Seaside, -Model, -Security) still have the same names though, so
hopefully it won't be *too* bad. For the most part, the changes were
*relatively* minor as I recall. I'm certainly happy to answer any questions
about my intent, though I suspect my commit messages were relatively clear.
You'll have to be careful that the changes you are merging are still
platform-safe (ie. some of my commits will have been removing senders of
unsafe selectors and the new code you're merging might still use them) but
of course whoever next updates one of the other platform ports will catch
those eventually if you miss them anyway.
Julian