From: Jameson Graef Rollins <jrollins@finestructure.net>
To: David Bremner <david@tethera.net>, Pieter Praet <pieter@praet.org>,
	notmuch@notmuchmail.org
Subject: Re: revised patch for gmime init, with test.
In-Reply-To: <874nw0nfa8.fsf@zancas.localnet>
References: <1325306261-21444-2-git-send-email-kaz.rag@gmail.com>
	<1325388169-8444-1-git-send-email-david@tethera.net>
	<871ur4ltnx.fsf@praet.org> <877h0wnu1l.fsf@zancas.localnet>
	<874nw0nfa8.fsf@zancas.localnet>
User-Agent: Notmuch/0.10.2+168~g34b8bac (http://notmuchmail.org) Emacs/23.3.1
	(x86_64-pc-linux-gnu)
Date: Fri, 13 Jan 2012 12:52:48 -0800
Message-ID: <87ty3ziau7.fsf@servo.finestructure.net>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
	micalg=pgp-sha256; protocol="application/pgp-signature"
Precedence: list

--=-=-=
Content-Transfer-Encoding: quoted-printable

On Fri, 13 Jan 2012 05:05:35 -0400, David Bremner <david@tethera.net> wrote:
> I thought about this a bit more, and I agree that at least the release
> candidates (basically anything tagged on branch release) ought to be
> merged back to master. Since any series of bugfix patches seems to be
> cause for a new release candidate, this should avoid the need to have
> doubly applied patches.
>=20
> I'm less convinced about the need to merge every little doc change and
> debian packaging change back to master right away. This might be a
> purely aesthetic objection; I'm not sure if the extra merge commits
> cause any problems for e.g. bisection.

Doesn't everything need to be merged into master eventually anyway?  It
seems to me that unless it's a change that very narrowly targeting an
issue in a release branch that is not an issue in master, every patch
will ultimately need to be applied to both.  It doesn't really make
sense to me to apply a change to one branch and not the other, if they
will eventually need to be applied to both anyway.

jamie.

--=-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJPEJmhAAoJEO00zqvie6q8fyEQAKHp8cM8tcGzrM6cy4BotSqJ
xCCnTQ90qigr4xVkH5glNQJ58XSdV5OAh10Vs+aBSfdmvJVmOqFnfI6W9+zfOIL4
aCMz1ez56eB3kj0lnZL7t+fPwV+6WFNa20Zq37Z5nUzj7gPvk5RLL/U27V4mHleq
nQpczaiqKy22OURyvl+hnRICod5fGL5B7vp7C8c2m2NfAfcmspa7FhMsUDs2tGs6
1FWaWEcgvCBKtTweJBrVDqp5ixd8sth1ShvYCqbRzyqa9x6Vjg6tlc5UhnZWmy1U
T0XPEg9NOjIc+muuVAN1C5wqDzpr0VcTBQXNoB6o021YOLLS5I7xt1+bq2F/7mNy
Bf7BZVQlJdVvGR0oDy00kFqEW7MvOPLNE1t/VPy+4TDIDRazzW6ZHJ9OgR1b9iXs
XI5VhvGUpW1vyowe/REX9m6Yda511zucigQWfIXmrJMPjnlWsJ6Z6kfV8iDLo1Bs
Kgr5cfNhDwPCHw+B3lpIQmVlVoZZFerImxTmqqivXchC0aIFMyFK6CVIkJRpt9tI
tqG//ZYz0ZYNk8aqCjLmnZMaafC9dRvmzSXXtMHXaVEveGm3vkthEltQjDMVHBu3
T+czbfrNYzILnXw2lvyGEgRo/0tkfg4BcsNSPUb6xvMdROwMBW12+q98KsAarzXG
MjM0Kk/xBoyLPsuRXScb
=+lFB
-----END PGP SIGNATURE-----
--=-=-=--