Re: [PATCH] uncrustify.cfg: comments and more types

diff --git a/6f/06282dbb98ec5efda34f565eaa3738e53a051b b/6f/06282dbb98ec5efda34f565eaa3738e53a051b
new file mode 100644 (file)
index 0000000..0fe93fb
--- /dev/null
+++ b/6f/06282dbb98ec5efda34f565eaa3738e53a051b
@@ -0,0 +1,73 @@
+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 A70D8431FB6\r
+       for <notmuch@notmuchmail.org>; Sat, 28 Jan 2012 03:59:48 -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 a2x5cS5XTkfM for <notmuch@notmuchmail.org>;\r
+       Sat, 28 Jan 2012 03:59:47 -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 8C48A431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 28 Jan 2012 03:59:47 -0800 (PST)\r
+Received: from zancas.localnet\r
+       (fctnnbsc36w-156034071197.pppoe-dynamic.High-Speed.nb.bellaliant.net\r
+       [156.34.71.197]) (authenticated bits=0)\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id q0SBxdQm017216\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
+       Sat, 28 Jan 2012 07:59:40 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.77)\r
+       (envelope-from <bremner@unb.ca>)\r
+       id 1Rr6wV-0008O6-It; Sat, 28 Jan 2012 07:59:39 -0400\r
+From: David Bremner <david@tethera.net>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] uncrustify.cfg: comments and more types\r
+In-Reply-To: <1327527465-10321-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <1327527465-10321-1-git-send-email-tomi.ollila@iki.fi>\r
+User-Agent: Notmuch/0.11+124~g3f003a3 (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sat, 28 Jan 2012 07:59:39 -0400\r
+Message-ID: <87vcnwvxzo.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, 28 Jan 2012 11:59:48 -0000\r
+\r
+On Wed, 25 Jan 2012 23:37:45 +0200, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
+> Changes to devel/uncrustify.cfg:\r
+\r
+I'm not sure why (because there should not be intervening changes), but\r
+this does not apply to current master. From git am -3, I get\r
+\r
+,----\r
+| Using index info to reconstruct a base tree...\r
+| <stdin>:49: trailing whitespace.\r
+| # or left operand of a binary multiplication operation. \r
+| error: patch failed: devel/uncrustify.cfg:107\r
+| error: devel/uncrustify.cfg: patch does not apply\r
+| Did you hand edit your patch?\r
+| It does not apply to blobs recorded in its index.\r
+| Cannot fall back to three-way merge.\r
+| Patch failed at 0001 uncrustify.cfg: comments and more types\r
+| When you have resolved this problem run "git am --resolved".\r
+`----\r