[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 04:36:53PM +0100, Till Kamppeter wrote:

> Sorry, from "merge up the changes to trunk" I understood to merge my 
> changes into the trunk.

Sorry I wasn't clear. "merge up" usually means "from trunk into branch", 
"merge down" is "from branch into trunk."

> Is it OK if I modify src/configure.ac to include drivers from contrib 
> only if the user sets an option, for example "--with-contrib"?

I'd rather we just get the code ported and building on the branch first.

 -r