From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] vim: Update to 8.0
Date: Fri, 21 Oct 2016 11:08:22 +0100 [thread overview]
Message-ID: <7560e2caf77ecfae4c6d9396905c8c73@ipfire.org> (raw)
In-Reply-To: <1476946191-17320-1-git-send-email-stefan.schantl@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1147 bytes --]
Hi,
this patch is unfortunately corrupted and I cannot merge it.
Could you please send me a git pull request to branch with only this
change?
[root(a)rice-oxley ipfire-3.x]# git am -s /home/ms/Downloads/\[PATCH\]\
vim\ Update\ to\ 8.0.eml
Applying: vim: Update to 8.0
fatal: corrupt patch at line 53418
Patch failed at 0001 vim: Update to 8.0
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".
-Michael
On 20/10/2016 07:49 AM, Stefan Schantl wrote:
> This is a major update to the latest stable version of vim.
>
> * Remove hardcoded version strings from nm file.
> * Adjust download patches bash script for the new
> release.
> * Drop SELinux support.
>
> Fixes #11233.
>
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> vim/patches/download.sh | 4 +-
> vim/patches/vim-7.3.001.patch0 | 55 -
> vim/patches/vim-7.3.002.patch0 | 55 -
> vim/patches/vim-7.3.003.patch0 | 45 -
...
parent reply other threads:[~2016-10-21 10:08 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <1476946191-17320-1-git-send-email-stefan.schantl@ipfire.org>]
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=7560e2caf77ecfae4c6d9396905c8c73@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.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