On 2010-05-23, 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 just did this and it seemed to work fine. Specifically, I cloned
the vim repo, which was at changeset a8afba7027ae at the time, and
merged the 7.2.437 patch to the vim73 branch as follows.
hg update vim73
hg merge default
hg ci
I had to manually merge the file that contains the patch list,
version.c, I think, but that was easy using vimdiff.
You should be able to merge each Vim 7.2 patch to the vim73 branch
as it comes along.
Regards,
Gary
--
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
