This cycle's commit-on-default-during-code-freeze award goes to...

Adrian Buehlmann adrian at cadifra.com
Tue Oct 23 17:48:12 CDT 2012


On 2012-10-24 00:21, Matt Mackall wrote:
> On Tue, 2012-10-23 at 21:18 +0200, Thomas Arendsen Hein wrote:
> 
>> - If it is your intention to find someone to point your finger at,
>>   then congratulations, you have won.
> 
> Sorry, I tend to get a little sassy after >2.5 years of repeating
> myself:
> 
> pre: http://markmail.org/message/yctfuysalgc4zyws
>  "after we freeze the code base, all work will take place on the stable
> branch"
> 1.5: http://markmail.org/message/gcft626fanaexl7x
>  "all changes until the release should be pushed to the stable branch"
> 1.7: http://markmail.org/message/ktq5vmtyj4wxnxir
>  "No more commits on the default branch until 1.7 is released (Nov 1)"
> 1.8: http://markmail.org/message/x7zhcjy7ulbimugl
>  "Usual rules for the stable branch apply: bug fixes and doc fixes only"
> 2.1: http://markmail.org/message/ilx6eqgmzkeccldt
>  "Crew: no more commits to the default branch, please. Update to stable
> today."
> 2.2: http://markmail.org/message/dmkhd2kdyiv7ohdd
>  "if you're a crew or i18n committer, no commits on default!"
> 2.3: http://markmail.org/message/hn7yrpl5zjfcennj
>  "crew, check out stable NOW to avoid future scolding"
> 2.4: http://markmail.org/message/isjjzqiba44vjl6c
>  "Translators and crew: no commits on the default branch, please."
> 
> (Looks like I didn't send out freeze notices for 1.6, 1.9, or 2.0,
> possibly under the assumption that people had figured out the rules.)
> 

Martin Geisler wrote on Feb 14, 2010 4:47:45 AM ("Re: 1.5 code freeze
started" [1]):
> We (tonfa, hstuart, pmezard) agreed on IRC that we will push bug fixes
> on the stable branch and merge stable into default once or twice a day.

Seems to me this makes sense and this is what Thomas has done with
917a37b76845 (merging stable into default).

[1] http://markmail.org/message/yzx3txuo2uyul3rv


More information about the Mercurial-devel mailing list