On Sun, May 23, 2010 at 12:38:10PM +0200, 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.
Merging vim73 into default should work fine, and it currently does. I tried it earlier today. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega <[email protected]>
signature.asc
Description: Digital signature
