On 2010-05-23, sc <[email protected]> wrote:
> my hg repo got horked -- it was fine til i did something wrong
> today and everything i tried made it worse -- i had 6 heads in
> my repo and merge always found inscrutable ways of failing
>
> my falback, blowing away the entire directory and starting with a
> fresh clone is proving problematical
>
> about the only thing i know i can do and do successfully is the
> clone, which i've done several times now but can't seem to get
> back to 7.3 -- what i am winding up with is 7.2.437
I think you're missing update,
hg update vim73
which you should do after the clone and before editing any files.
That will select the branch or revision that will be the parent of
your working copy. I usually think of 'update' as changing my view
into the repo, or as changing the revision that I'm working on, but
that's not quite right and I'm trying to change my mental model and
my vocabulary to match what Mercurial actually does.
> if i have done a clone, if i have modified feature.h and
> committed that, how do i then tell hg i want to build against 7.3
> and not 7.2?
If you seem to be building Vim 7.2, then you're probably using the
default branch. If you've already committed feature.h, you probably
committed it on the default branch, too.
If it's easy to start over again, I would do that, because anything
else requires hg manipulations that I'm not all that familiar with
yet.
If you haven't already done so, I'd recommend adding graphlog and
pager to your list of extensions. All you have to do is add to your
~/.hgrc:
[extensions]
hgext.graphlog =
hgext.pager =
[pager]
pager = LESS='FRX' less
attend = annotate, cat, diff, export, glog, help, log, qdiff
Then you can use
hg glog
to see a graphical representation of the repo's log along with an @
indicator showing your current parent(s). That has really helped me
to visualize the effects of my hg operations.
HTH,
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
