Christian MICHON, 26.01.2009: > On Mon, Jan 26, 2009 at 10:58 AM, Markus Heidelberg > <markus.heidelb...@web.de> wrote: > >> > (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.
This is exactly what you should NOT do. I called it "rebase" above, in terms of git it is rather a "reset", but call it "rewrite" or whatever. With a moving/non-fast-forward 'master' branch, people have no gain, but only problems with arrival of 7.3, they can't do "git pull" then. This is simply the wrong repository design. > according to Bram's actual point of view (look at the cvs repo), the > master branch is the current latest version... This can be achieved with a 'master' branch, that won't be reset. > > There's no problem with keeping commit message information, while > > formatting it git-like. > > the only problem is the time spent doing/verifying it... The time spent in writing a script only once. That's fine, if the result looks good. Markus --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
