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
Date: Sat, 28 Jan 2012 07:59:39 -0400 [thread overview]
Message-ID: <87vcnwvxzo.fsf@zancas.localnet> (raw)
In-Reply-To: <1327527465-10321-1-git-send-email-tomi.ollila@iki.fi>
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".
`----
next prev parent reply other threads:[~2012-01-28 11:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-25 21:37 [PATCH] uncrustify.cfg: comments and more types Tomi Ollila
2012-01-28 11:59 ` David Bremner [this message]
[not found] <id:"1327527465-10321-1-git-send-email-tomi.ollila@iki.fi">
2012-02-07 16:34 ` Tomi Ollila
2012-06-03 16:44 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87vcnwvxzo.fsf@zancas.localnet \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
--cc=tomi.ollila@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).