[Qgis-developer] Merging the C_API branch

Frank Warmerdam warmerdam at pobox.com
Fri Mar 14 10:51:44 EDT 2008


Marco Hugentobler wrote:
> Hi Frank and Peter,
> 
> Thanks for reminding me, I merged the gdal c-api changes to trunk now.
> Please apologize the delay, I thought that Frank would merge the branch, 
> that's why I didn't do the merge earlier
> 
> (from my mail Feb 26:
> "So my suggestion is that you go ahead and merge the branch to 
> trunk if there is no objection on the devel list in the next two days")

Marco,

Well, first of all, any process that requires me to remember to do something
two days later based on no one objecting has a 93% chance of my forgetting
it forever.  Also, I imagine the part about me doing it didn't sink in -
likely I skimmed the email to fast.

>> I must say this "branch for changes then merge" process has not left me
>> with warm and fuzzy feelings, and it is hard to imagine my taking it on
>> again unless I am contributing to someone else's effort.
> 
> Is the delay in merging the reason for the not warm and fuzzy feelings or is 
> it something different?

It seemed like a great deal of overhead for a modest change.  It was a painful
hassle for me to setup a new development tree and get it configured properly
(please no volunteers to help with this).  Second it was painful for people
to test the branch. It seems custom builds of the software had to be prepared
and distributed for testing.  Third the merge seemed to drag on in an unclear
sort of limbo for many weeks.

I would add that I'm somewhat merge-phobic, and in other projects I try to use
it only on very narrowly defined well understood changes.

Some of these issues are just my backwards and grumpy nature.

> In my opinion, the "branch for changes then merge" process has increased the 
> stability of the qgis code considerably and also the release interval is much 
> better because of this process (was >1 year before). 

If it is the best strategy for the project, then by all means continue.  But
be aware that the approach is off putting to at least some contributors.

Best regards,
-- 
---------------------------------------+--------------------------------------
I set the clouds in motion - turn up   | Frank Warmerdam, warmerdam at pobox.com
light and sound - activate the windows | http://pobox.com/~warmerdam
and watch the world go round - Rush    | President OSGeo, http://osgeo.org



More information about the Qgis-developer mailing list