John McGowan wrote: > I am getting errors in patching vim 7.3. > > 1: I keep an original copy of the source code and apply all > the patches each time. If there is a problem with a > patch, I have the original source and can patch up to > but not including the problematic patch. > > 2: I had sent you a note about a problem with patch 7.3.050 > in Fedora Core 12. That patch uses 'the --as-needed linker option' > I did not want simply not to install it as that might throw > off lines and so I changed it to look for > if $CC -Wl,--help 2>/dev/null | grep "seorenxderernn783434xeor" > > /dev/null; then > instead of > if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then > (and similar code where it appears) > so that it would not find "seorenxderernn783434xeor" and would > use the old linker. > > 3: I patch with --verbose and capture the output and then grep > through it looking for 'Hunk' to check that each hunk worked > without problem. > > > Patching the original source for 7.3 gives the following errors: > > [FAILures as well as those which required OFFSETs to patch files:] > > PROBLEMS WITH PATCHES: > 7.3.191 [offsets only] > 7.3.196 [offsets only] > 7.3.202 [fuzz, offsets and failure] > 7.3.203 [failure only] > > TWO FAILures: > > Patch 7.3.202: Modification of indent.txt > Patch 7.3.203: Modification of os_win32.txt
The failures happen because the runtime files are committed to the mercurial repository. For a while I had been making docs patches against the original 7.3 runtime files, but the differences became so big that the patches are hard to remove from what didn't need to be included. I'm not sure what would be a convenient way to solve this. Making patches for the runtime files would be the correct thing perhaps? Can't fix what is already broken though. -- Two percent of zero is almost nothing. /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -- 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
