[gs-devel] Merger ESP/GPL GS: GPL GS 8.57 is out, how to proceed with the merger

[Ralph Giles]

On Mon, May 14, 2007 at 10:41:21AM +0100, Till Kamppeter wrote:

> >Can you merge up the changes to trunk since you made the branch? That 
> >will be a cleaner test. And the stderr-related build problems happen on
> >the cluster too.
> 
> Done.

No Till. I asked you to merge the changes FROM trunk TO the branch. Not 
the other way around. Please read more carefully.

The changes build for me on feisty as well, but not on MacOS X. Disable 
the contrib stuff or back out your changes again until this is resolved.

 -r