Christian Ludwig wrote: > Hello guys, > > I'm confused. I hope somebody has the time and can help me. > > 1. confusion (Patchfile 1203) > ============ > Looking at > http://ftp.vim.org/pub/vim/patches/7.4/7.4.1203 > in the section for the file src/proto/if_ole.pro (lines 1-5) then the > same patch-block (patch-directive) is given twice (even with the same > timestamp). > > How is this supposed to work? I'm using GNU patch 2.7.5 and I get the > warning/question: > Reversed (or previously applied) patch detected!
My mistake. I'll remove the duplicate. > 2. confusion (Patchfile 1197) > ============ > Looking at > http://ftp.vim.org/pub/vim/patches/7.4/7.4.1197 > in the section for the file src/gui.c (3rd hunk, line 5004-5011): There the > #ifdef FEAT_NETBEANS_INTG > netbeans_gui_register(); > is changed to > #ifdef FEAT_CHANNEL > channel_gui_register_all(); > If I compare this with the (corresponding?) git patch: > https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e > I cannot find this hunk. That change should have been included in 7.4.1182. But it wasn't. I suspect the git version was updated earlier. Should still work when applying patches in sequence. > Where are my mistakes? > Is http://ftp.vim.org/pub/vim/patches/7.4/ a valid source for getting > vim-patches? > Are they supposed to reflect the state I see in github? It's getting more difficult with 1200 patches. Getting the sources from git or mercurial is a lot simpler now. > Sorry for the confusion > C. Ludwig > > PS: > http://ftp.vim.org/pub/vim/patches/7.4/7.4.1222, version.c > search for timestamp 2016-01-31 14:36:53.419217174 > two times the same change/patch hunk The version number change in version.c is automatically added to the patch. But when there are other changes in version.c I need to manually fix that. In this case I missed that. Fixed now. -- >From "know your smileys": :'-D Laughing so much that they're crying /// 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 --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
