On Dec 5, 5:10 pm, "William Stein" <[EMAIL PROTECTED]> wrote:
>
> 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.
When using the upgraded version:
sage -t "devel/sage/sage/rings/polynomial/
multi_polynomial_libsingular.pyx"
------------------------------------------------------------
Unhandled SIGBUS: A bus error occured in SAGE.
This probably occured because a *compiled* component
of SAGE has a bug in it (typically accessing invalid memory)
or is not properly wrapped with _sig_on, _sig_off.
You might want to run SAGE under gdb with 'sage -gdb' to debug this.
SAGE will now terminate (sorry).
------------------------------------------------------------
A mysterious error (perphaps a memory error?) occurred, which may have
crashed doctest.
[17.3 s]
Unfortunately, neither of these is repeatable: when I do ./sage -t ...
on either of the above files now, I get no errors.
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
-~----------~----~----~----~------~----~------~--~---
