public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
* Re: [PATCH] vim: Update to 8.0
       [not found] <1476946191-17320-1-git-send-email-stefan.schantl@ipfire.org>
@ 2016-10-21 10:08 ` Michael Tremer
  0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2016-10-21 10:08 UTC (permalink / raw)
  To: development

[-- 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 -
...

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2016-10-21 10:08 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <1476946191-17320-1-git-send-email-stefan.schantl@ipfire.org>
2016-10-21 10:08 ` [PATCH] vim: Update to 8.0 Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox