On Mon, Jan 26, 2009 at 10:58 AM, Markus Heidelberg <markus.heidelb...@web.de> wrote: >> ever tried git-cvsimport on the official vim repo ? you'll see it's >> linear, and vim7 and vim<7 are actually different CVS repositories. > > No, I haven't tried this.
you'll need a few hours, if not a full half-day :( >> I personally discarded the >> alpha/beta releases because it was clouding the overall picture. > > I'd personally include them for the sake of completeness. We don't have > so much history, I don't think it's sane to discard even more. And > without the bleeding edge, people will use another method for getting > the Vim sources. if you git-cvsimport, you'll get them with the proper timestamps. It's a lot of tags, actually :( > >> > (3) Another solution is to branch off immediately at each release. This >> > is the easiest solution that will always work, but we'd get the >> > problem, that the 'master' branch will stay on the current minor >> > release and the features have to be rebased against the next minor >> > release one time. So this isn't really a solution, I shouln't even >> > have mentioned it. >> > >> > 7.0.001---7.0.243 'vim-7.0' >> > / >> > | 7.1.001---7.1.330 'vim-7.1' >> > | / >> > | | 7.2.001---7.2.088 'vim-7.2' >> > | | / >> > 7.0---7.1---7.2 'master' >> >> I like this solution, but we should have master='vim-7.2' instead. > > I don't like it, as described above. It looks nice, but it's not useful > for development on master. The problem with having master=vim-7.2 is > that we need to rebase the master branch for vim-7.3. This would > actually be your layout, just with the releases connected with each > other. you can always delete master branch and make it point to the latest. according to Bram's actual point of view (look at the cvs repo), the master branch is the current latest version... and this is even more obvious when you see patches not being back-ported. keep in mind branches are like aliases in git > >> > I will also adjust the commit message somewhat, e.g.: >> > - extract a first single line summary as described by the git >> > conventions >> > - convert tabs to spaces (that's the reason, why the messages aren't >> > aligned properly in your github repo) >> > - remove the "Files:" section, it's not necessary within a VCS, --stat >> > is much nicer >> >> I tried to do that, and maybe forgot to change tabs into spaces. I >> wanted to keep as much info from Bram original patches. > > There's no problem with keeping commit message information, while > formatting it git-like. the only problem is the time spent doing/verifying it... > >> After some thoughts, maybe this need rework: I'll look into it. >> >> What do you mean by --stat ? > > git diff|log|show --stat > I though you wanted it in the commit message... Good, less work. -- Christian -- http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside ! --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
