On Thu, 08 Nov 2007 20:33:22 -0000, John Cremona <[EMAIL PROTECTED]> wrote:
>
> 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
Delete
/home/src/sage/local/bin/sage-wiki
then try again. That will work. (I saw this once before.)
William
--~--~---------~--~----~------------~-------~--~----~
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/
-~----------~----~----~----~------~----~------~--~---
