The 1.7 freeze has started!

[Martin Geisler]

Thomas Arendsen Hein <thomas at intevation.de> writes:

> * Martin Geisler <mg at aragost.com> [20101021 10:45]:
>> Benoit Boissinot <bboissin at gmail.com> writes:
>> 
>> > On Thu, Oct 21, 2010 at 12:12 AM, Matt Mackall <mpm at selenic.com> wrote:
>> >> I've merged default into stable. No more commits on the default branch
>> >> until 1.7 is released (Nov 1), normal rules for stable apply: bug fixes
>> >> and doc fixes only.
>> >
>> > It would be awesome to have a hook at intevation to help prevent
>> > errors from crew members (I know it happened to me a couple of times
>> > to apply/push a stable patch on the wrong branch during a freeze).
>> 
>> Should we not just continue like normal: push bug fixes and doc fixes to
>> the stable branch? Then merge the stable branch back into default once a
>> day or so.
>> 
>> In 10 days the stable branch will be tagged with 1.7 and we'll begin
>> putting new stuff on the default branch.
>> 
>> The reason I like this scheme is that it is simple: we just continue
>> like normal. People who tests the stable branch gets all the bugfixes
>> right away and people who track default get them too when we merge
>> stable into default.
>
> I could implement both at the same time:
> Reject changesets to default which are not a merge.
>
> OK?

Sounds good to me.

> I don't think I have to verify that one parent is from stable as this
> is just a safety net and not mandatory access control.

Right, don't make it too rigid.

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://aragost.com/mercurial/