Petr Rockai wrote:

>> On Thursday July 22th        (N+14), the release branch is deep
>>                                      -frozen
> 
> It seems we are about here now. However, there are two issues that I
> would like to address *somehow* before we decide that the hard freeze
> is now.  
> 
> Those are the issue 1599 fix by Adolfo that just landed in the patch
> tracker (and will need some review and probably at least one
> amendment iteration).  
> 
> The other is the http packs stuff, which is partially in, but it's
> not in a good enough shape for release (due to --lazy breakage,
> etc.).  
> 
> I think there are two main options:
> 
> - slip the 2.5 cycle a bit
> - release 2.5 without these, but let them into 2.5.1

I think that we should either abandon them for the entire 2.5 series, or
slip 2.5.

2.5.x should just be bugfixes on 2.5, IMO.

If we feel we have a lot of worthwhile features that won't make 2.5 and
that we want to get out earlier than December, we could always decide to
have 2.6 early. That would require more release management work by
someone, but equally releasing 2.5 now and then letting them into 2.5.1
also adds to the release management burden.

> 
> I am more inclined for the latter, actually. The plan of action would
> therefore be to: 
> 
> - roll back the HTTP packing from branch-2.5 (but keep it untouched on
>   HEAD, since we have diverged the branches anyway)
> - release 2.5 on schedule (as below)
> - land the above changes in HEAD in the meantime
> - post-2.5, roll out a 2.5.1 (probably a couple weeks later) that
>   would include these two (and maybe others as needed)
> 
> The main downside here is, I think, that the rollback patch is going
> to conflict with the later patches that depend on the original. On
> the other hand, rolling this back on HEAD is going to land our
> students in trouble since their work in progress will conflict badly
> with the rollback.    

There's precedent for unpulling on branches rather than rolling back.
Perhaps that would be a better route in view of the merging problems we
would get otherwise.

Ganesh

=============================================================================== 
Please access the attached hyperlink for an important electronic communications 
disclaimer: 
http://www.credit-suisse.com/legal/en/disclaimer_email_ib.html 
=============================================================================== 

_______________________________________________
darcs-users mailing list
darcs-users@darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-users

Reply via email to