On 23 May 2010 12:38, Bram Moolenaar wrote: > > Björn Winckler wrote: > >> I was wondering what the plans for the Mercurial branches are once 7.3 >> is finished. Will "vim73" be merged into "default" at some point, or >> will there be one giant "vim73 patch" applied to "default" (making all >> changesets in the "vim73" branch into a patch) and "vim73" will be >> left, or ...? >> >> I am wondering because I am in the process of changing the MacVim repo >> to use the Vim Mercurial repo as upstream instead of the svn repo. >> This is to allow me to make an informed decision as to which branch to >> merge my own "macvim" branch against. > > When 7.3 is released it will become the default branch. How this is > done I don't know. There were some problems when I used "hg rebase" on > the vim73 branch, now it's no longer possible to merge directly from the > default branch into the vim73 branch. I don't know if the other way > around would still work. Or that we need to use export + import.
I don't know how to do this either -- from what I can tell you will have to rewrite history in some way (e.g. export+import). On that topic, will the history of the "default" branch never be rewritten (no rebase, etc.)? If so, I will merge the MacVim branch against the default branch (and probably keep a topic branch that merges against vim73). Björn -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php
