Reminder: default branch is closed

Martin Geisler mg at aragost.com
Thu Jan 26 02:27:28 CST 2012


Matt Mackall <mpm at selenic.com> writes:

> On Wed, 2012-01-25 at 19:40 +0200, Fabian Kreutz wrote:
>> Saluton!
>> 
>> Since I push only to the i18n clone, I don't even understand why it is a
>> problem to do during a code freeze. But true, I didn't hear about a
>> code freeze. So what should I do better next time?
>
> First, read this:
>
> http://mercurial.selenic.com/wiki/TimeBasedReleasePlan
>
> I'd really like there to be no commits on the default branch during
> the freeze because I want people to be focusing on _running and
> testing the stable branch_ during this period.

I'm sure you realize this, so let me point it out for others: running
the default branch in that 14 day window is not different from running
the stable branch. After the merge of default into stable, the two are
equivalent (I assume we wont commit new and big code on default in that
14 day window so that the branches only diverge slightly).

If translators only use the default branch, then they might make some
commits in the code freeze that isn't part of the release. That's not
too big a loss -- they will be part of the next release that comes just
three months later. An ambitious translator can of course work on both
branches.

> Merging default into stable is something I'd like to happen only once
> per cycle and should only be done by me.

Since we could use the normal rules even when we're approaching a major
release, I guess you like this workflow because of the psychological
effect it has of putting everybody into "release mode"? I can see some
sense in that.

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://www.aragost.com/mercurial/customer-projects/


More information about the Mercurial-devel mailing list