On Fri, Dec 5, 2008 at 4:39 PM, John H Palmieri <[EMAIL PROTECTED]> wrote:
>
> On Dec 5, 10:35 am, mabshoff <[EMAIL PROTECTED]> wrote:
>> On Dec 5, 9:58 am, John H Palmieri <[EMAIL PROTECTED]> wrote:
>>
>> Hi John,
>>
>> > On Intel Mac OS X 10.5, I'm getting failures after upgrading from
>> > 3.2.1: the first time I did './sage -testall -long', it hung after the
>> > tutorial, but I haven't been able to reproduce this. The other times,
>> > I'm getting
>> > "A mysterious error (perphaps a memory error?) occurred, which may
>> > have crashed doctest." multiple times: for calculus/calculus.py, for
>> > combinat/designs/incidence_structures.py, and for combinat/
>> > permutation.py. (At this point, I stopped the testing.)
>>
>> > In case this is a problem with the upgrade process, I'm starting over
>> > and building from scratch...
>>
>> > John
>>
>> It would be interesting to see if anyone can reproduce the upgrade
>> problem on one hand and on the other if a -ba had fixed it.
>
> sage -ba crashes because integer.pyx is corrupted (presumably from the
> upgrade process): lines 135 - 142 look like
> {{{
> from sage.libs.pari.gen cimport gen as pari_gen, PariInstance
> <<<<<<< local
>
> =======
>>>>>>>> other
>
> import sage.rings.infinity
> }}}
>
> I wonder if this was a version of integer.pyx which I had edited while
> working on #4639, and that somehow messed up the upgrading.
>
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.
William
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
