John Little wrote:
> Bram said:
>
> > The Mercurial repository now gets you the latest 7.3 version. =A0If you
> > were following the "vim73" branch, you need to do:
> >
> > =A0 =A0 =A0 =A0 hg update default
>
> I did that, and I got 7.2.446.
>
> Then I tried hg update -C, it did nothing. Then I ran hg pull, and it
> pulled all the 7.3 beta changes. I ran hg merge, and it merged lots of
> stuff, but did a gvimdiff on several files; there were 7.2 versions,
> "other" versions which appeared to be 7.3, and "base" versions. I
> ran :%diffget 2 on every file, but memfile.c got badly messed up, with
> many compile errors.
>
> I really must learn to use Mercurial, I've been blundering in the
> darkness of ignorance.
>
> It'll be easiest for me to wipe the lot, and hg clone again, I think.
Hmm, you should have started with "hg pull", then "hg update default".
You should not have done "hg merge"!
--
>From "know your smileys":
:-{} Too much lipstick
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute -- http://www.A-A-P.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
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
