On Thu, Nov 13, 2008 at 12:29 PM, björn <[EMAIL PROTECTED]> wrote: > > 2008/11/13 Markus Heidelberg <[EMAIL PROTECTED]>: >> >> Yes, they don't have a common base, that makes merging even more difficult >> than it should be, I think. Having a common base would be a good idea, it >> would benefit both the vim_extended and MacVim repository. > > I'm open to discussions on this. One problem is that I am still a > newbie when it comes to Git so I'm not quite sure how this "merge" > would work.
I tried doing this once a few weeks back. It amounted (as I recall) to basically doing the following: - init an empty git repo - setup remotes for vim_extended and MacVim, and fetch them - do a rebase of MacVim/master onto vim_extended/vim - weep as the conflicts pile up A rebase makes more sense than a merge to me, otherwise the resulting repo will have to tote around two copies of Vim's source from svn. There were conflicts in files that had expanded keywords ($Id$), and some in the autoconf stuff. Nothing looked too terrible, I just got bored with it quickly :) So I don't think this rebase is undoable, just tedious. > Actually, my main concern is that I want to avoid landing in a > situation where I pull from another Git repo only to have the > maintainer disappear (please don't take offense Markus). The SVN repo > seems fairly "stable" and is updated often enough so I it is easy for > me to continue pulling from it. > > Another thing I did not quite yet grasp is whether the vim_extended > repo is pulling from SVN as well or if you (Markus) are applying > Bram's patches manually. Since I am already pulling from SVN I am not > quite clear on the benefits on changing my routine? Also, I need to > know exactly how "difficult" such a change would be (I'd rather spend > my time working on MacVim than on it's repository). I see some git-svn metadata in the commits for vim_extended, so I believe it pulls directly from SVN for the vim source. This also means that, were MacVim to become based on this repo, even if vim_extended becomes unmaintained MacVim could continue to use git-svn to pull in vim source changes from Subversion without going through vim_extended. > In case it isn't clear: I'm asking questions because I am ignorant -- > I am not trying to come up with reasons not to make a change. If > there is some significant advantage to changing the MacVim Git repo > I'll gladly do it, unless it is "too" difficult. I don't think it is too difficult, mostly just tedious. After doing this, MacVim would essentially be a fork of vim_extended, but could live on without it should vim_extended ever die off. 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 so it can be pulled back into the MacVim repo if you so choose. Jason --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
