Re: [Fofredux-devel] project developer guide

[Kevin <ke...@dr...>]

Kevin wrote:
> Andrew Turner (nilspace) wrote:
>
>> Looks great! I made editing changes (line wraps, spelling). Also you
>> specified that you cannot merge to a stable branch - yet there are
>> bugfixes. A bugfix may entail a 'merge', right?
>>
>>  
>>
> Yes, a bugfix will mandate a merge, but the opposite of what you are 
> thinking.  The bugfix should be commited to the stable branch first, 
> then the change should be merged onto HEAD.   This will avoid 
> inadvertently introducing additional bugs/features/etc that may exist 
> on HEAD at the time of the merge.
>> Also, we probably want a section on dev practices within the project
>> itself. Architecture, function and variable naming conventions, etc.
>> How we suggest modifying/patching.  When/if we have a "plugin" arch,
>> how to write a plugin.
>>  
>>
> All good stuff to have in there.  Another thing I am trying to figure 
> out is how to correctly use the vendor branch of CVS for 3rd party 
> stuff we include with fofr. (magpierss, etc)  This will avoid the 
> problem we had where a local patch was overwritten by an upgrade of 
> the 3rd party source.
So, I got around the proper usage of "cvs import".  I updated the 
developer guide to include the procedure to update the bundled third 
party software.  (Magpierss and ADODB Lite)   This should be followed 
for anything else we bundle with our distribution. (AJAX lib, etc)

-Kevin