committing to the branch...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

committing to the branch...

Ray Barlow
I have just applied this fix to the trunk, is the general process that I
can apply it to the branch 4.0 release because it's a small bug fix or
do we want a cool off period to allow others to review and test so as to
reduce the risk of adverse effects getting it to the "stable" branch?

Ray


[hidden email] wrote:
> Author: rayb
> Date: Tue Apr 24 08:19:09 2007
> New Revision: 531978
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=531978
> Log:
> Corrections to the HTML for the layout of the orders items table, so the columns should now be aligned properly.
>
>  
Reply | Threaded
Open this post in threaded view
|

Re: committing to the branch...

BJ Freeman
from http://docs.ofbiz.org/display/OFBADMIN/Release+Plan
Steps for applying a fix from the trunk to a branch as part of maintenance:

seems to put that responsibility on those that have checked out the branch.


Ray Barlow sent the following on 4/24/2007 8:05 AM:

> I have just applied this fix to the trunk, is the general process that I
> can apply it to the branch 4.0 release because it's a small bug fix or
> do we want a cool off period to allow others to review and test so as to
> reduce the risk of adverse effects getting it to the "stable" branch?
>
> Ray
>
>
> [hidden email] wrote:
>> Author: rayb
>> Date: Tue Apr 24 08:19:09 2007
>> New Revision: 531978
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=531978
>> Log:
>> Corrections to the HTML for the layout of the orders items table, so the columns should now be aligned properly.
>>
>>  
>
>
>
Reply | Threaded
Open this post in threaded view
|

Re: committing to the branch...

Ray Barlow
Personally I was expecting to contribute fixes to the branch as well
even if I generally work on and use the trunk.

At this point in time merging the fix I've done into the branch requires
little to no extra effort as I can safely say if it works in the trunk
it will work in the branch as they are not that far apart at the moment!
That will change as more time goes by and more testing will be required
when transitioning changes in either direction.

The more stabilising fixes applied to the branch the better for the
project, community and users I think.

Ray


BJ Freeman wrote:

> from http://docs.ofbiz.org/display/OFBADMIN/Release+Plan
> Steps for applying a fix from the trunk to a branch as part of maintenance:
>
> seems to put that responsibility on those that have checked out the branch.
>
>
> Ray Barlow sent the following on 4/24/2007 8:05 AM:
>  
>> I have just applied this fix to the trunk, is the general process that I
>> can apply it to the branch 4.0 release because it's a small bug fix or
>> do we want a cool off period to allow others to review and test so as to
>> reduce the risk of adverse effects getting it to the "stable" branch?
>>
>> Ray
>>
>>    
Reply | Threaded
Open this post in threaded view
|

Re: committing to the branch...

David E Jones

Ray,

You're absolutely correct that we should be applying patches as much  
as we can and have time for to the release branch to fix bugs there  
as well.

I just updated the permissions so you should now be able to do this.

-David


On Apr 24, 2007, at 12:52 PM, Ray Barlow wrote:

> Personally I was expecting to contribute fixes to the branch as well
> even if I generally work on and use the trunk.
>
> At this point in time merging the fix I've done into the branch  
> requires
> little to no extra effort as I can safely say if it works in the trunk
> it will work in the branch as they are not that far apart at the  
> moment!
> That will change as more time goes by and more testing will be  
> required
> when transitioning changes in either direction.
>
> The more stabilising fixes applied to the branch the better for the
> project, community and users I think.
>
> Ray
>
>
> BJ Freeman wrote:
>> from http://docs.ofbiz.org/display/OFBADMIN/Release+Plan
>> Steps for applying a fix from the trunk to a branch as part of  
>> maintenance:
>>
>> seems to put that responsibility on those that have checked out  
>> the branch.
>>
>>
>> Ray Barlow sent the following on 4/24/2007 8:05 AM:
>>
>>> I have just applied this fix to the trunk, is the general process  
>>> that I
>>> can apply it to the branch 4.0 release because it's a small bug  
>>> fix or
>>> do we want a cool off period to allow others to review and test  
>>> so as to
>>> reduce the risk of adverse effects getting it to the "stable"  
>>> branch?
>>>
>>> Ray
>>>
>>>


smime.p7s (3K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: committing to the branch...

jonwimp
In reply to this post by Ray Barlow
Ray,

A bugfix is a bugfix, whether or not it fixes bugs more than it causes harm.

Commit the bugfix in the release branch, so those of us using the release branch can use your
bugfix and alert you if it does cause harm. A bad bugfix will be quickly corrected soon after.

As long as we're strictly applying only bugfixes, all bugfixes should go to the release branch.

The only exception is where the bug to be fixed in the trunk does not exist in the release branch.

Yes, you do have to confirm that the bug is not applied to a vacuum in the release branch.

Jonathon

Ray Barlow wrote:

> I have just applied this fix to the trunk, is the general process that I
> can apply it to the branch 4.0 release because it's a small bug fix or
> do we want a cool off period to allow others to review and test so as to
> reduce the risk of adverse effects getting it to the "stable" branch?
>
> Ray
>
>
> [hidden email] wrote:
>> Author: rayb
>> Date: Tue Apr 24 08:19:09 2007
>> New Revision: 531978
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=531978
>> Log:
>> Corrections to the HTML for the layout of the orders items table, so the columns should now be aligned properly.
>>
>>  
>
>