Hi Björn, Jason already explained several things, so just some comments from me.
björn, 13.11.2008: > > 2008/11/13 Markus Heidelberg <[EMAIL PROTECTED]>: > > > > Jason Foreman, 10.11.2008: > >> Sorry I had not responded before, but I wanted to let you know that I > >> find your vim_extended repository invaluable. I use it to build my > >> own Vim for Linux. I would like to also use it to build MacVim, but > >> the MacVim repo has its own git branch imported from Vim SVN source, > >> and I've had a huge headache trying to "merge" the two. So that may > >> have to wait. > > > > 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. > > 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). No, I'm using the SVN repo, too. > I do think that you have managed to set up the vim_extended repo in a > much "cleaner" way than what I did -- e.g. the MacVim Git repo has no > nice commit history (because I think I am pulling from the "wrong" SVN > branch) whereas vim_extended does -- but I need more incentive than > that to start messing around with the repository. When setting up the repo I first tried trunk (what you are using), but it had a lot of "Merged from the latest developing branch" log entries. Now I'm using the vim7.2 branch. The log messages are displayed nice with the typical patch comment, but they aren't git-like anyway. The empty line after the first line is missing, try "git log --pretty=oneline" to see what I mean. It may be a git bug though, compared to "git log --pretty=format:%s". But I was satisfied with it, git-svn is easy to use and the log messages are available. Markus --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
