From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] vim: Update to 8.0 Date: Fri, 21 Oct 2016 11:08:22 +0100 Message-ID: <7560e2caf77ecfae4c6d9396905c8c73@ipfire.org> In-Reply-To: <1476946191-17320-1-git-send-email-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7719450976593520629==" List-Id: --===============7719450976593520629== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 > --- > 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 - ... --===============7719450976593520629==--