Re: hg problems

[Elliott S. <ell...@gm...>]

On Sat, Apr 30, 2011 at 3:27 AM, Samir SAADA <ze...@gm...> wrote:

> Hi,
>
> On Fri, Apr 29, 2011 at 10:26:30AM -0700, Don Cohen wrote:
> >
> >   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)
> >
>
> the pull process did its job,
> the update (-u) failed because you probably
> need to do a merge before updating.
> multiple heads?


I got this error once by having uncommitted changes while updating. I had to
revert my changes before Mercurial would stop complaining. Just something to
check.


-- 
Elliott Slaughter

"Don't worry about what anybody else is going to do. The best way to predict
the future is to invent it." - Alan Kay