Actually I think the easiest way to fix this, at least for me, was to do sage -upgrade, have mercurial roll back the merge and then simply do: sage: hg_sage.pull()
This will get you up to the latest version. On Mar 28, 2007, at 12:27 PM, Robert Bradshaw wrote: > > When I looked carefully at my sage -upgrade output, I noticed a hg > "rollback" caused by the error indicated in my previous email. This > is why I didn't get any of the patches without moving sage-main > first. Perhaps the hg repository in the sage-2.4.1.1 is corrupted? > > - Robert > > On Mar 28, 2007, at 12:16 PM, Joel B. Mohler wrote: > >> >> Actually, what I get after a sage -upgrade didn't include the >> patch. Did >> my -upgrade go south? There should not be a >> number_field_element.py and >> there should be a number_field_element.pyx in the sage/rings/ >> number_field >> directory. >> >> -- >> Joel >> >> On Wednesday 28 March 2007 10:30, William Stein wrote: >>> On 3/28/07, Joel B. Mohler <[EMAIL PROTECTED]> wrote: >>>>> I've released sage-2.4.1. It has: >>>>> >>>>> * d roe: massively updated p-adics code >>>>> * r bradshaw: much misc code; Coleman integration >>>>> * misc bug fixes >>>> >>>> What about my number field pyrexification? >>>> Joel >>> >>> I forgot to mention Joel Mohler's excellent contribution to number >>> field >>> arithmetic, which is also included in SAGE-2.4.1.1. Now basic >>> arithmetic is much faster than it was before. >>> >>> William >>> >>> >> >> > > > Cheers, Yi -- http://www.yiqiang.net --~--~---------~--~----~------------~-------~--~----~ 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://sage.scipy.org/sage/ and http://modular.math.washington.edu/sage/ -~----------~----~----~----~------~----~------~--~---