Re: hg problems

[<don...@is...>]

Sam Steingold writes:
 > > * Don Cohen <qba...@vf...3-vap.pbz> [2011-04-29 10:26:30 -0700]:
 > >
 > >   hg pull -u
 > > says:
 > >   pulling from http://clisp.hg.sourceforge.net:8000/hgroot/clisp/clisp
 > >   searching for changes
 > >   adding changesets
 > >   adding manifests
 > >   adding file changes
 > >   added 5 changesets with 12 changes to 7 files
 > >   abort: crosses branches (merge branches or use --check to force update)
 > >
 > > I'm guessing someone has to fix the repository ?
 > 
 > 1. yes, you need to fix your local repo. try "hg st", "hg up tip", "hg
 > out" &c. usually "hg revert" and (if you have local commits) "hg strip"
 > will help you.

Can you explain what sort of change on the sf repo caused this problem?
Evidently you think that 
 hg pull -u
is not necessarily enough to update my version of the source.
In that case, please tell me what I ought to do instead.
What does 
 hg up tip
do in comparison with hg pull -u ?

 > 2. this is not a clisp issue (it would have been if the repo @ sf were
 > corrupt, but it is not). please ask the mercurial mailing list.

I imagine it's a problem with either the way hg is being used to alter
the repository, or the way I'm trying to update my copy.  If I sent
this to the hg list they'd probably ask what I'm trying to do, and
although at one level I know what I'm trying to do - update my version
to be the same as the sf repo - I don't know what sort of policies are
intended for updating the repo - are we trying to avoid all branching,
so that all I need is a single tip?  If so, the message about crossing
branches suggests that some recent updates have failed to conform to
that policy.