From: Bastien <bzg@altern.org>
To: nicholas.dokos@hp.com
Cc: Torsten Anders <torsten.anders@beds.ac.uk>, emacs-orgmode@gnu.org
Subject: Re: Thanks for Lilypond export (and minor comments)
Date: Fri, 08 Jul 2011 11:08:07 +0200 [thread overview]
Message-ID: <87k4bt3zt4.fsf@gnu.org> (raw)
In-Reply-To: <17595.1310108424@alphaville.dokosmarshall.org> (Nick Dokos's message of "Fri, 08 Jul 2011 03:00:24 -0400")
Hi Nick,
Nick Dokos <nicholas.dokos@hp.com> writes:
> I'm not sure whether I posted this before but if you haven't seen
> it before, it's probably worth reading:
>
> http://nvie.com/posts/a-successful-git-branching-model/
Nice read -- thanks.
In fact, we *do* have a documented process for important fixes
that need to go to the maint branch. See README_maintainer:
,----[ Minor releases ]
| The release number for minor releases look like this: =7.13.01=
|
| Minor releases are small amends to main releases. Usually they fix
| critical bugs discovered in a main release. Minor bugs are not
| fixed - they will be adressed in the next main release. Only the fix
| to the bug is bundled into a release, without the main development
| work going on in the master branch. Since the bug fix will also be
| needed in the master branch, usually the fix is made in master and
| then cherry-picked into maint. When this is done, a release is made
| from maint with this command:
|
| : make fixrelease TAG=7.13.01
`----
So in the case Eric raised, I would ideally cherry-pick important fixes
from the master branch to the maint branch then make a release based on
this maint branch.
I think this makes sense when the master (development) branch is quite
unstable, with several untested features.
As long that I'm confident many testers use the latest master branch,
I'm reluctant to go through the hassle of cherry-picking commits...
and just release a minor release with all latest dev from master.
Call me lazy, but I'd rather keeping things simple here.
--
Bastien
next prev parent reply other threads:[~2011-07-08 9:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-07 16:38 Thanks for Lilypond export (and minor comments) Torsten Anders
2011-07-07 20:01 ` Bastien
2011-07-08 1:35 ` Eric Schulte
2011-07-08 6:13 ` Bastien
2011-07-08 7:00 ` Nick Dokos
2011-07-08 9:08 ` Bastien [this message]
2011-07-08 16:02 ` Suvayu Ali
2011-07-09 8:44 ` Bastien
2011-07-10 16:50 ` Suvayu Ali
2011-07-11 16:50 ` Bastien
2011-07-11 17:50 ` suvayu ali
2011-07-19 12:29 ` Bernt Hansen
2011-07-19 12:40 ` suvayu ali
2011-07-08 21:00 ` Achim Gratz
2011-07-09 8:46 ` Bastien
2011-07-08 7:56 ` Martyn Jago
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k4bt3zt4.fsf@gnu.org \
--to=bzg@altern.org \
--cc=emacs-orgmode@gnu.org \
--cc=nicholas.dokos@hp.com \
--cc=torsten.anders@beds.ac.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).