Jason Foreman, 19.11.2008: > > On Thu, Nov 13, 2008 at 1:03 PM, Jason Foreman <[EMAIL PROTECTED]> wrote: > > This weekend I can do a trial run of rebasing MacVim onto > > vim_extended. If I get it working, I will make the result available > > > > Well, I didn't get around to it as early as I'd hoped, but I did do a > trial run of the rebase. It didn't take much time, and there were > only a handful patches with conflicts, most of which were easily > resolved. I skipped one huge patch from MacVim that imported new > runtime files, and ran a diff of runtime/ between vim_extended/vim and > vim_extended/macvim and noted that the only changes were MacVim > related, so I think that turned out okay. > > I've pushed the resulting branch into a fork of vim_extended at > http://repo.or.cz/w/MacVim_ext.git/
This clone went fast, as I could use my local vim_extended as reference. That's great! > If anyone is interested please have a look. I don't expect this to be > the final result, as there is no doubt something I did wrong or could > do better. I want to setup a new repo based on patches instead of svn. I hope to get started this week, then you could rebase against that. This should be easier now that you are already based on a tree without the rsync runtime files. > One thing that I do not like is that the commit times for > all the MacVim commits show as when I performed the rebase. They also > show me as the committer (though they retain the correct author > name/date). The author name/date are important, the commit properties change during rebase, I don't think that's bad, that's the system. When querying with git-log or git-show, the commit name/date isn't shown anyway by default. > I made sure that MacVim still built for me, and I did try merging in a > couple patch branches. It seems to work okay so far. I tried merging the relativenumber branch. Comparing conflicting lines with over 1000 chars (syntax/vim.vim) is the hell :) > Anyway, this result is encouraging, and I'm eager to hear what > everyone thinks should be done from here. Me, too. I can't wait joining some effort into a common base. Markus --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
