From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org,
Jonathan Haws <Jonathan.Haws@sdl.usu.edu>
Subject: Re: [B.A.T.M.A.N.] [PATCH] alfred: Externalizing ALFRED_INTERVAL for setting synchronization interval
Date: Thu, 28 Jul 2016 19:41:07 +0200 [thread overview]
Message-ID: <31954371.21uiIYPYc7@sven-edge> (raw)
In-Reply-To: <1469726363.5505.7.camel@c00941>
[-- Attachment #1: Type: text/plain, Size: 1202 bytes --]
On Donnerstag, 28. Juli 2016 17:19:22 CEST Jonathan Haws wrote:
> ALFRED_INTERVAL is now externalized via the -p option (synchronization
> period). If specified as option, user supplied interval is used,
> otherwise the default interval of ALFRED_INTERVAL is used.
Fails to apply because your mail client corrupted the patch:
Description: alfred: Externalizing ALFRED_INTERVAL for setting synchronization interval
Applying: alfred: Externalizing ALFRED_INTERVAL for setting synchronization interval
fatal: corrupt patch at line 30
Patch failed at 0001 alfred: Externalizing ALFRED_INTERVAL for setting synchronization interval
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
'git am' failed with exit status 128
Looks like you are using "Evolution 3.10.4-0ubuntu2". Please check
https://www.kernel.org/doc/Documentation/email-clients.txt for instructions
how to force this client not to corrupt patches. Or just use "git send-email"
(like most developers)
Kind regards,
Sven
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2016-07-28 17:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-28 17:19 [B.A.T.M.A.N.] [PATCH] alfred: Externalizing ALFRED_INTERVAL for setting synchronization interval Jonathan Haws
2016-07-28 17:41 ` Sven Eckelmann [this message]
[not found] ` <1469729158.5505.10.camel@c00941>
2016-07-28 18:18 ` Sven Eckelmann
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=31954371.21uiIYPYc7@sven-edge \
--to=sven@narfation.org \
--cc=Jonathan.Haws@sdl.usu.edu \
--cc=b.a.t.m.a.n@lists.open-mesh.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