[gs-devel] Re: ESP Ghostscript merge

[Ralph Giles]

On Wed, Jun 06, 2007 at 11:17:11PM +0100, Till Kamppeter wrote:

> I have merged in the gs-esp-gpl-merger branch now. According to "svn 
> diff" only the changes from the ESP Ghostscript patches are done. 
> Strange: The "svn merge" seemed to download all files from the source 
> tree, also the ones identical in the trunk and the branch. The "svn 
> commit" seemed to upload also all files in the libpng subdirectory which 
> are not changed according to "svn diff".

Not sure about this. The svn server we use is quite old, so there may be 
some inefficiency there. And svn merge in general isn't very smart.

> How can I easily check whether the trunk and the gs-esp-gpl-merger 
> branch are identical now?

The missing gomni.c, and a property on gdevwts.c that handn't been 
merged up from trunk were the only differences I saw. I've also done
some additional cleanup; please let us know if you run into problems on 
the CUPS side from any new commits.

You should be able to start packaging from HEAD now, and delete the 
gs-esp-gpl-merger branch and your convenience.

Thanks again!

 -r