Hi Jaap, On Thu, Jul 23, 2009 at 6:55 AM, Jaap Spies<j.sp...@hccnet.nl> wrote: > > slabbe wrote: >> Bonjour Jaap, >> >> This is now http://trac.sagemath.org/sage_trac/ticket/6593. >> >> I will post a patch soon. >> > > Thanks! I could not apply the patch{ > > sage: hg_sage.patch('../trac_6593-word-morphism-doctest-sl.patch') > cd "/home/jaap/downloads/sage-4.1.1.alpha0/devel/sage" && hg status > /home/jaap/downloads/sage-4.1.1.alpha0/local/lib/python2.6/site-packages/sage/misc/hg.py:240: > DeprecationWarning: os.popen3 is deprecated. Use the subprocess > module. > x = os.popen3(s) > cd "/home/jaap/downloads/sage-4.1.1.alpha0/devel/sage" && hg status > cd "/home/jaap/downloads/sage-4.1.1.alpha0/devel/sage" && hg import > "/home/jaap/downloads/trac_6593-word-morphism-doctest-sl.patch" > abort: outstanding uncommitted changes > > sage: hg_sage.status() > Getting status of modified or unknown files: > cd "/home/jaap/downloads/sage-4.1.1.alpha0/devel/sage" && hg status > ! sage/server/notebook/templates/async_lib.js > ! sage/server/notebook/templates/jmol_lib.js > ! sage/server/notebook/templates/notebook_lib.js
You can't commit anything in Sage 4.1.1.alpha0 since the repository has been corrupted by the previous patches on ticket #6307. One option is to refer to the new patches on #6307 for a fix. Another is to wait for Sage 4.1.1.alpha1 to get out in a couple of hours. Sage 4.1.1.alpha1 will revert #6307, so that should fix the repository corruption problem. A third option is to manually revert the patches on #6307 yourself. -- Regards Minh Van Nguyen --~--~---------~--~----~------------~-------~--~----~ To post to this group, send email to sage-devel@googlegroups.com To unsubscribe from this group, send email to sage-devel-unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/sage-devel URLs: http://www.sagemath.org -~----------~----~----~----~------~----~------~--~---
