On Dec 5, 2008, at 5:10 PM, William Stein wrote:
> 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:
>>>
>> 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.
I think upgrading should *fail* (right at the start) if a merge is
required. Either that or it should move the sage-main directory out
of the way rather than doing a merge 30 minutes into it. Thoughts?
- Robert
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
