Nico Weber, 14.11.2008: > > > The problem with all the $Id$ conflicts come from the runtime files > > updates > > Brörn does. He has committed the runtime updates into his vim branch > > and merges > > it into the master branch. I would suggest to use separate branches > > for macvim > > and the runtime updates. > > Wouldn't that make checking out, building and updating the macvim repo > more complicated?
He could also create a branch with macvim and updated runtime files combined. But the repository layout and branch management is his decision, of course. Though when working on the same base with vim_extended, I'd recomment not to mix official Vim and runtime updates in the same branch. > > Yes, a rebase does make more sense. But as I would separate macvim > > from > > runtime, I wouldn't just rebase macvim/master on vim_extended/vim. I > > just > > tried "git format-patch macvim/vim..macvim/master". Then you have > > the bare > > macvim patches, as the runtime files are committed to macvim/vim, > > which you > > can apply with "git am". But keep care, I found a patch with runtime > > file > > updates, commit ef6776890f3f3d324d7d32cb17fc1cefb0c61bd2 was > > committed to > > macvim/master instead of macvim/vim. Maybe there are some more? > > Anyway, I > > tried it for interest and the first conflict where git am failed was > > at patch > > 290 out of 672. > > 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. Markus --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
