björn, 15.11.2008: > > 2008/11/15 Markus Heidelberg <[EMAIL PROTECTED]>: > >> > >> As far as I know, macvim/vim contains the official runtime patches, > >> and macvim/master also gets MacVim-specific runtime patches) > > > > What are the official runtime patches? For runtime files there don't exist > > patches. MacVim specific runtime changes in macvim/master are no problem. > > What > > I mean are the latest runtime files available from vim.org (ftp, rsync, aap) > > but not in the CVS or SVN repository. These are included in macvim/vim and > > caused the merge problems. > > I never intended to keep a pristine public branch of Vim in the MacVim > repo. The branch called "vim" was specifically created to have both > the stuff from SVN and the latest runtime files (rsync'ed). I have a > remote branch called "svn-vim" (which pulls from SVN) if I ever need > to access the Vim source without any updated runtime files. It would > be easy to make a local checkout, but I have no use of that. > > The entire point of the "vim" branch is that I need to separate the > MacVim stuff from Vim _and_ official runtime file updates.
OK, then I understand. How do you update the runtime files? Do you just overwrite them on your vim branch and then commit them? > Anyway, I still haven't seen any reasons to switch to vim_extended yet > (so far, nothing makes _my_ life simpler). If you don't want to use any of the features included in vim_extended, then no, it probably won't make _your_ life simpler. But the life of other MacVim users which want to use some features from it. > If Jason manages to make a > rebase that keeps the MacVim commit history intact and that I can > continue working from easily I'll take another look. However, I still > want to be able to build MacVim snapshots with the latest runtime > files as well as the latest Vim source code without having to jump > through hoops. (Jason, if there is anything I can do to help with > your endeavours, please let me know.) I'll try to create a runtime branch that is mergeable without real conflicts. Then you could merge from vim_extended/vim and vim_extended/runtime into your macvim branch. Do you like this idea? Markus --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
