From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 15 Nov 2009 09:14:53 GMT
Subject: Re: [PATCHv3] Add branch management for releases to gitworkflows
Message-ID: <7vy6m8p2sy.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20091114071946.6117@nanako3.lavabit.com>

Nanako Shiraishi <nanako3@lavabit.com> writes:

> Other minor clarifications in the text are also included in this change:
>
>  * Clarify "building documentation" a bit; the post-update hook
>    creates preformatted documentation pages.
>
>  * The latest documentation set uses "fast-forward", not "fast
>    forward".
>
>  * Call 'next' branch an integration branch, not a "testing" branch, to be
>    consistent with the Graduation section.
> ...
> Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
> ---

Your changes look mostly fine.

I obviously agree with the removal of "use 'branch -f' to update maint"
which I said I do not want to see in the document number of times.

There is another thing; I didn't notice it in the earlier round but the
way I actually rotate 'master', 'maint' and the 'maint-one-rev-old' is
similar to how Thomas mentioned.  That is:

================================
git checkout master
git log ..maint        ;# should see nothing
git tag ...            ;# release task
git checkout maint
git branch maint-X.Y.Z ;# without -f so that I can catch a typo to
                          clobber what already exists
git merge --ff-only master
================================

My fingers are trained to type "git merge" before --ff-only was invented,
so I actually do use "merge master" without --ff-only option in the last
step, but if I see a real merge created with that command, I notice it and
treat it as a grave error, so in the Recipe we should say --ff-only.