From: David Bremner <david@tethera.net>
To: Pieter Praet <pieter@praet.org>, notmuch@notmuchmail.org
Subject: Re: revised patch for gmime init, with test.
In-Reply-To: <871ur4ltnx.fsf@praet.org>
References: <1325306261-21444-2-git-send-email-kaz.rag@gmail.com>
	<1325388169-8444-1-git-send-email-david@tethera.net>
	<871ur4ltnx.fsf@praet.org>
User-Agent: Notmuch/0.10.2+178~gb6b26f4 (http://notmuchmail.org) Emacs/23.3.1
	(x86_64-pc-linux-gnu)
Date: Thu, 12 Jan 2012 23:46:46 -0400
Message-ID: <877h0wnu1l.fsf@zancas.localnet>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Precedence: list

On Thu, 12 Jan 2012 18:25:38 +0100, Pieter Praet <pieter@praet.org> wrote:
> On Sat, 31 Dec 2011 23:22:46 -0400, David Bremner <david@tethera.net> wrote:

> with differing hashes), this has the potential of causing confusion
> and/or quite some extra work when debugging using git-bisect(1), so
> I'd like to propose that bugfixes for (to-be-)released code are only
> applied on the 'maint' branch ('release' in the case of Notmuch),
> and then immediately merged back into 'master'.  In fact, this would
> preferrably happen after *every* (series of) commit(s) on the 'maint'
> branch, to prevent issues like [1].

There is some merit it to this. On the other hand, it makes the history
messier.  [1] would have also been prevented by making the patch against
the right branch.