From: Karel Zak <kzak@redhat.com>
To: Benno Schulenberg <bensberg@justemail.net>
Cc: Util-Linux <util-linux@vger.kernel.org>
Subject: Re: [patches] adding accents, fixing encodings, and more textual stuff
Date: Wed, 30 Jan 2013 19:19:27 +0100 [thread overview]
Message-ID: <20130130181927.GH3741@x2.net.home> (raw)
In-Reply-To: <1359477853.14228.140661184045573.44739122@webmail.messagingengine.com>
On Tue, Jan 29, 2013 at 05:44:13PM +0100, Benno Schulenberg wrote:
> The first patch adds accents to a few names in the NEWS file;
> since this file is now UTF-8 it will support accented letters.
I have applied last two patches only. It seems like a problem with
email encoding, my mutt see the attachments as
0001-docs-NEWS-add-some-missing-accents- [text/x-patch, base64, us-ascii, 6.3K]
What about to send the patches by git-send? ..or use tar ball if canot
use git-send.
Karel
$ git am -i -3 ~/00*.patch
Commit Body is:
--------------------------
docs: NEWS: add some missing accents, since this is now UTF-8
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
--------------------------
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: docs: NEWS: add some missing accents, since this is now
UTF-8
Using index info to reconstruct a base tree...
error: patch failed: NEWS:347
error: NEWS: 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 docs: NEWS: add some missing accents, since this
is now UTF-8
The copy of the patch that failed is found in:
/home/projects/util-linux/util-linux/.git/rebase-apply/patch
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am
--abort".
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
next prev parent reply other threads:[~2013-01-30 18:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-29 16:44 [patches] adding accents, fixing encodings, and more textual stuff Benno Schulenberg
2013-01-30 18:19 ` Karel Zak [this message]
2013-01-30 20:20 ` Benno Schulenberg
2013-01-31 12:55 ` Benno Schulenberg
2013-02-06 10:36 ` Karel Zak
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130130181927.GH3741@x2.net.home \
--to=kzak@redhat.com \
--cc=bensberg@justemail.net \
--cc=util-linux@vger.kernel.org \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox