Return-Path: <bremner@unb.ca>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id A70D8431FB6
	for <notmuch@notmuchmail.org>; Sat, 28 Jan 2012 03:59:48 -0800 (PST)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: -2.3
X-Spam-Level: 
X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
	tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id a2x5cS5XTkfM for <notmuch@notmuchmail.org>;
	Sat, 28 Jan 2012 03:59:47 -0800 (PST)
Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id 8C48A431FAE
	for <notmuch@notmuchmail.org>; Sat, 28 Jan 2012 03:59:47 -0800 (PST)
Received: from zancas.localnet
	(fctnnbsc36w-156034071197.pppoe-dynamic.High-Speed.nb.bellaliant.net
	[156.34.71.197]) (authenticated bits=0)
	by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id q0SBxdQm017216
	(version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);
	Sat, 28 Jan 2012 07:59:40 -0400
Received: from bremner by zancas.localnet with local (Exim 4.77)
	(envelope-from <bremner@unb.ca>)
	id 1Rr6wV-0008O6-It; Sat, 28 Jan 2012 07:59:39 -0400
From: David Bremner <david@tethera.net>
To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org
Subject: Re: [PATCH] uncrustify.cfg: comments and more types
In-Reply-To: <1327527465-10321-1-git-send-email-tomi.ollila@iki.fi>
References: <1327527465-10321-1-git-send-email-tomi.ollila@iki.fi>
User-Agent: Notmuch/0.11+124~g3f003a3 (http://notmuchmail.org) Emacs/23.3.1
	(x86_64-pc-linux-gnu)
Date: Sat, 28 Jan 2012 07:59:39 -0400
Message-ID: <87vcnwvxzo.fsf@zancas.localnet>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Jan 2012 11:59:48 -0000

On Wed, 25 Jan 2012 23:37:45 +0200, Tomi Ollila <tomi.ollila@iki.fi> wrote:
> Changes to devel/uncrustify.cfg:

I'm not sure why (because there should not be intervening changes), but
this does not apply to current master. From git am -3, I get

,----
| Using index info to reconstruct a base tree...
| <stdin>:49: trailing whitespace.
| # or left operand of a binary multiplication operation. 
| error: patch failed: devel/uncrustify.cfg:107
| error: devel/uncrustify.cfg: patch does not apply
| Did you hand edit your patch?
| It does not apply to blobs recorded in its index.
| Cannot fall back to three-way merge.
| Patch failed at 0001 uncrustify.cfg: comments and more types
| When you have resolved this problem run "git am --resolved".
`----