Re: [gnugo-devel] paul_3_13.8 and paul_3_13.9

[pogonyshev]

Dan wrote:
> The two mkpat patches, paul_3_13.8 and paul_3_13.9 conflict
> with each other, possibly seriously. The patch paul_3_13.9 
> is in the CVS now. The patch paul_3_13.8 is not.
> 
> Paul, should I try to merge paul_3_13.8 or not?

uhm, sorry, i should have waited for paul_3_13.8 to come into cvs.
from a quick review of the patches it seems to me that merging
them must be pretty simple:

  paul_3_13.9 changes the calling convention of write_elements()
  paul_3_13.8 changes write_elements() itself.

if you want to merge paul_3_13.8 yourself, remove the `name'
parameter from write_elements() and change each reference to
it with a reference to `prefix'.

or, tell me and i'll resubmit paul_3_13.8 diff'ed against the
current cvs (i can't do it now since i'm not at home).

sorry again,
  Paul


p.s. arend_3_13.8 must conflict with paul_3_13.9 as well. i changed
the autohelper_func[] array in mkpat.c and Arend's patch changes
some of its elements.

-- 
+++ GMX - Mail, Messaging & more  http://www.gmx.net +++
NEU: Mit GMX ins Internet. Rund um die Uhr für 1 ct/ Min. surfen!