Re: Patch Submission

Marcel van der Boom <[email protected]> Sat, 07 Dec 2002 10:15:41 +0100
Newsgroups gmane.comp.cms.xaraya.patches
Organization HS-Development BV
Message-ID <[email protected]>
I applied this patch to the repository. It created content conflicts with 
newer changesets which i resolved.

The nature of the conflicts were not critical, the newer changesets 
contained more additions to the pnLegacy.php file.

I resolved them by merging the two files so both changes are present in the 
file now. I didn't check wether the changes are *semantically* correct. 
They are *syntactically* correct however.

For richard:
- the patch has already created changesets in your local tree, the 
resolving in your tree if slightly different than in all the others, 
because until now you were the only one which had that changeset. It should 
however *never* generate a conflict directly related to the patch. If it 
does, there is something wrong with the patch system and I would like to 
know about it.

We have completed the first cycle of patch submission, review and applying 
it. The second cycle will be more smoothly i guess, as a number of bugs 
were removed from the patch system.  Thanks for testing this out!

Marcel

Richard Cave wrote:

> The patch that I submitted contains two files:
>  1. pnLegacy.php
>     - Added legacy functions that were necessary for module
> initialization.  Most of these functions were pnDB<name>.
>  2. /modules/example/xarinit.php
>     - Fixed some basic bugs in the code.  $query in error messages does
> not exist prior and should be $sql.  Check that category module exists
> before removing deleting those module vars.
> 
> This patch was intentionally brief as this was my first attempt at the
> Xaraya patch process using BitKeeper.
> 
> If you have any questions regarding the changes in the patch, feel free
> to contact me.
> 
> Cheers,
> Rich

-- 
Marcel van der Boom, HS-Development BV
Kwartiersedijk 14B Fijnaart, The Netherlands
T: +31-168-468822, F: 0168-468823, E: [email protected]