On Sun, Aug 24, 2008 at 3:20 PM, Bin Zhang <[EMAIL PROTECTED]> wrote: > > William Stein wrote: >> Try >> >> sage: hg_scripts.pull() >> sage: hg_scripts.merge() >> and possibly >> sage: hg_scripts.updae() >> >> > > sage: hg_scripts.merge() > cd "/home/zhang/src/sage-3.1.1/local/bin" && hg merge > abort: repo has 3 heads - please merge with an explicit rev
It says "repo has 3 heads, please merge", so you have to explicitly merge. Do hg_sage.heads() to see a list of heads, then do sage: hg_sage.merge(one_of_the_head_numbers) > > sage: hg_scripts.update() > cd "/home/zhang/src/sage-3.1.1/local/bin" && hg update > abort: crosses branches (use 'hg merge' or 'hg update -C') > > >> then restart sage. >> >> On Sun, Aug 24, 2008 at 2:42 AM, Bin Zhang <[EMAIL PROTECTED]> wrote: >> >>> Hi, >>> >>> I have upgraded my sage 3.0.6 to 3.1.1 using "sage -upgrade". >>> It seems to me it did not upgrade sage-banner: >>> >>> ./sage >>> ---------------------------------------------------------------------- >>> | SAGE Version 3.0.6, Release Date: 2008-07-30 | >>> | Type notebook() for the GUI, and license() for information. | >>> ---------------------------------------------------------------------- >>> >>> sage: version() >>> 'SAGE Version 3.1.1, Release Date: 2008-08-17' >>> >>> >>> Best regards, >>> Bin >>> > > > > -- William Stein Associate Professor of Mathematics University of Washington http://wstein.org --~--~---------~--~----~------------~-------~--~----~ To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/sage-support URLs: http://www.sagemath.org -~----------~----~----~----~------~----~------~--~---
