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

[Thomas Arendsen Hein]

* Matt Mackall <mpm at selenic.com> [20121024 02:18]:
> On Wed, 2012-10-24 at 01:42 +0200, Adrian Buehlmann wrote:
> > On 2012-10-24 00:58, Bryan O'Sullivan wrote:
> > > I think it makes sense too, but given Matt's role, it seems to me his
> > > expressed preference carries some extra weight, and it costs the rest of
> > > us relatively little to follow.
> > 
> > I've now added to the wiki that merging stable into default is unwanted:
> > 
> > http://mercurial.selenic.com/wiki/TimeBasedReleasePlan?action=diff&rev2=18&rev1=17
> > 
> > Apparently, it wasn't that clear yet.
> 
> Thanks. I guess I can see how people might not think 'no commits on
> default' was inclusive of merges.

So your sassy mail and my grumpy reply resulted in something good:
TimeBasedReleasePlan is more clear now.

I added some bits about the @ bookmark and possible issues in the
stable branch during the early days of the freeze.

Maybe the @ bookmark could be abused in a hook to prevent accidental
changes on the default branch, but this needs more tests to get the
timing (conflicting @ bookmark, bookmarks are sent after changes
etc.) right.

Regards,
Thomas

-- 
thomas at intevation.de - http://intevation.de/~thomas/ - OpenPGP key: 0x5816791A
Intevation GmbH, Neuer Graben 17, 49074 Osnabrueck - AG Osnabrueck, HR B 18998
Geschaeftsfuehrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner