On Sat, May 28, 2011 at 07:11:22PM +0800, H Xu wrote: > On 05/28/2011 03:49 AM, Danek Duvall wrote: > >I'm getting an error applying this, after having applied all previous > >patches to the 7.3 tarball: > >[...] > >Normally this is just fine. In fact, patches 191 and 196 were the only > >other patches that reported even needing an offset. > > Hello Danek Duvall, > > I see that you failed to patch a doc file, which is not only updated > in the patch way. Usually doc files are also updated in the vim > mercurial repository, which is probably the culprit of the patch > failure, so you can ignore this patch failure and obtain the latest > doc files at the mercurial repository.
I usually apply all the patches from the patches directory and then create a "runtime" patch that applies on top of those to bring the runtime up to the latest patchlevel. Then I can check the runtime patch into my workspace, but have the canonical patches downloaded. Unfortunately, there's no reasonable way to automate interleaving runtime patches with code. I'd prefer not to ignore errors, because that usually means something went wrong, and I'd like the build to fail if something went wrong. I could also try editing the patch on the fly before applying it, or try to apply the patch only to the non-runtime files, but the build architecture is making it a touch difficult to figure out how to do that. I'll find a way to work around it if necessary, but I was wondering whether this was simply a mistake, and if so, if the patch file on the ftp site could simply be regenerated to not include the changes to eval.txt, and let folks who want to patch that do so the usual way (or if the changes are truly integral, deliver them as changes that apply against 7.3). Or perhaps there's a smooth, generic patch-flow I'm not seeing where this problem isn't actually a problem. Thanks, Danek -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php
