2008/11/15 Markus Heidelberg <[EMAIL PROTECTED]>: > > björn, 15.11.2008: >> >> 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?
Yes, I do an "rsync --delete ...", then "git-add runtime", "git-commit". >> 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. ...and that is a good reason, but I was hoping for other benefits. ;) Anyway, as long as it doesn't make my life more difficult that reason is good enough to make the switch. Another thought just came to me though: what happens when Vim changes version (e.g. to 7.3) would I still keep pulling from the same branch in vim_extended or would I need to do something? I'm curious because the change to 7.2 caused various merge problems (so this is an instance where my life actually might get easier if I'm lucky). >> 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? Would the "runtime" branch only contain runtime files then, or what? All in all, I think it would benefit many users if there was an easy way to pull the latest runtime files. Using rsync has proven to be somewhat hazardous (as was witnessed when I accidentally added all the spell files and the repo grew 100 Mb...oops). Would I then be able to just "git-merge runtime", "git-merge vim" to get the latest source+runtime files? If so, I'd be happy (only one more command than what I need now), as long as it doesn't lead to more merge conflicts or something otherwise unforseen. Björn --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
