Re: hg problems

[Sam S. <sd...@gn...>]

> * Don Cohen <qba...@vf...> [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.

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.

-- 
Sam Steingold (http://sds.podval.org/) on CentOS release 5.6 (Final) X 11.0.60900031
http://camera.org http://pmw.org.il http://openvotingconsortium.org
http://ffii.org http://honestreporting.com http://palestinefacts.org
Daddy, why doesn't this magnet pick up this floppy disk?