Re: revised patch for gmime init, with test.

diff --git a/29/90574bcbc83dff8b108be91d3744b9e78f2081 b/29/90574bcbc83dff8b108be91d3744b9e78f2081
new file mode 100644 (file)
index 0000000..88bbe96
--- /dev/null
+++ b/29/90574bcbc83dff8b108be91d3744b9e78f2081
@@ -0,0 +1,81 @@
+Return-Path: <bremner@unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 56F2F429E28\r
+       for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 17:31:18 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id WMkcAzUKpC0X for <notmuch@notmuchmail.org>;\r
+       Fri, 13 Jan 2012 17:31:17 -0800 (PST)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id C0666431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 17:31:17 -0800 (PST)\r
+Received: from zancas.localnet\r
+       (fctnnbsc36w-156034076032.pppoe-dynamic.High-Speed.nb.bellaliant.net\r
+       [156.34.76.32]) (authenticated bits=0)\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id q0E1V5p4015570\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
+       Fri, 13 Jan 2012 21:31:06 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.77)\r
+       (envelope-from <bremner@unb.ca>)\r
+       id 1RlsSX-0008HT-GM; Fri, 13 Jan 2012 21:31:05 -0400\r
+From: David Bremner <david@tethera.net>\r
+To: Jameson Graef Rollins <jrollins@finestructure.net>,\r
+       Pieter Praet <pieter@praet.org>, notmuch@notmuchmail.org\r
+Subject: Re: revised patch for gmime init, with test.\r
+In-Reply-To: <87ty3ziau7.fsf@servo.finestructure.net>\r
+References: <1325306261-21444-2-git-send-email-kaz.rag@gmail.com>\r
+       <1325388169-8444-1-git-send-email-david@tethera.net>\r
+       <871ur4ltnx.fsf@praet.org> <877h0wnu1l.fsf@zancas.localnet>\r
+       <874nw0nfa8.fsf@zancas.localnet>\r
+       <87ty3ziau7.fsf@servo.finestructure.net>\r
+User-Agent: Notmuch/0.11 (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Fri, 13 Jan 2012 21:31:05 -0400\r
+Message-ID: <87pqenjciu.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 14 Jan 2012 01:31:18 -0000\r
+\r
+On Fri, 13 Jan 2012 12:52:48 -0800, Jameson Graef Rollins <jrollins@finestructure.net> wrote:\r
+> \r
+> Doesn't everything need to be merged into master eventually anyway?  It\r
+> seems to me that unless it's a change that very narrowly targeting an\r
+> issue in a release branch that is not an issue in master, every patch\r
+> will ultimately need to be applied to both.  It doesn't really make\r
+> sense to me to apply a change to one branch and not the other, if they\r
+> will eventually need to be applied to both anyway.\r
+\r
+The following two sequences of commands apply the same changes, but\r
+result in a different history graph.\r
+\r
+1) notmuch checkout release && git am patch  && \\r
+   notmuch checkout master && git cherry-pick release\r
+\r
+2) notmuch checkout release && git am patch  && \\r
+   notmuch checkout master && git merge release\r
+\r
+well, they apply the same changes if release was an ancestor of master\r
+when the they both began.\r
+\r