This happened (and the problem was still there on restarting): sage: sage: hg_scripts.merge() cd "/home/src/sage/local/bin" && hg merge abort: there is nothing to merge - use "hg update" instead sage: sage: hg_scripts.update() cd "/home/src/sage/local/bin" && hg update abort: untracked local file 'sage-wiki' differs from remote version sage: quit Exiting SAGE (CPU time 0m0.12s, Wall time 58m30.86s).
John On 08/11/2007, William Stein <[EMAIL PROTECTED]> wrote: > > On Nov 8, 2007 8:22 PM, John Cremona <[EMAIL PROTECTED]> wrote: > > > > Just upgraded to 2.8.12 prior to Sage Days 6, and find this: > > > > [EMAIL PROTECTED] > > ---------------------------------------------------------------------- > > | SAGE Version 2.8.10, Release Date: 2007-10-28 | > > | Type notebook() for the GUI, and license() for information. | > > ---------------------------------------------------------------------- > > > > Automatically updating the cached Gap workspace: > > /home/jec/.sage//gap/workspace-1140050670 > > sage: version() > > 'SAGE Version 2.8.12, Release Date: 2007-11-06' > > > > Is this some triviality or something else? Have I really got 2.8.12? > > Could you try: > > sage: hg_scripts.merge() > sage: hg_scripts.update() > > then restart Sage? It's now the case that Sage will not overwrite > changes you make to SAGE_ROOT/local/bin/ or to SAGE_ROOT/data/extcode, > but instead *merges* your changes with the new changes. Sometimes > this requires you to do something manually. > > William > > > William Stein > Associate Professor of Mathematics > University of Washington > http://wstein.org > > > > -- John Cremona --~--~---------~--~----~------------~-------~--~----~ 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://sage.math.washington.edu/sage/ and http://sage.scipy.org/sage/ -~----------~----~----~----~------~----~------~--~---
