On Dec 6, 8:50 am, mabshoff <[EMAIL PROTECTED]> wrote: > On Dec 6, 8:19 am, John H Palmieri <[EMAIL PROTECTED]> wrote: > > > On Dec 5, 5:10 pm, "William Stein" <[EMAIL PROTECTED]> wrote: > > Hi John, > > > > > > You have to manually resolve this merge conflict by editing > > > integer.pyx, choosing one of the two options, and then > > > check in the result of doing the merge. > > > Actually, before you posted this I just edited integer.pyx by hand and > > ran 'sage -b' to finish the compilation of the pyx files. > > > I had two doctest failures: > > > When building from scratch: > > > sage -t "devel/sage/sage/interfaces/psage.py" > > A mysterious error (perphaps a memory error?) occurred, which may have > > crashed doctest. > > Is that with #4719 applied or not?
Not. I've applied it now and am running each of these two doctests a bunch of times to see if I can get an error again. John --~--~---------~--~----~------------~-------~--~----~ To post to this group, send email to sage-devel@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/sage-devel URLs: http://www.sagemath.org -~----------~----~----~----~------~----~------~--~---
