Hi Rado, On Fri, Aug 7, 2009 at 1:33 PM, Rado<rki...@gmail.com> wrote: > > r...@rado-desktop:~/sage-4.0.2/devel/sage-lp$ cat sage/numerical/ > all.py.rej > --- all.py > +++ all.py > @@ -1,3 +1,4 @@ > from optimize import (find_root, find_maximum_on_interval, > > find_minimum_on_interval,minimize,minimize_constrained, > linear_program, find_fit) > +from sage.numerical.mip import *
It looks like the patch AllMIP.patch at ticket #6502 http://trac.sagemath.org/sage_trac/ticket/6502 depends on some other ticket or patch. As you know, the only failure when applying that patch is this block of code: [mv...@sage numerical]$ cat all.py.rej --- all.py +++ all.py @@ -1,3 +1,4 @@ from optimize import (find_root, find_maximum_on_interval, find_minimum_on_interval,minimize,minimize_constrained, linear_program, find_fit) +from sage.numerical.mip import * which is to be patched against the file sage/numerical/all.py As of Sage 4.1, the content of that file is [mv...@sage numerical]$ cat all.py from optimize import (find_root, find_maximum_on_interval, find_minimum_on_interval,minimize,minimize_constrained, linear_program, find_fit) which is just one (long) line. However, from the file all.py.rej, it looks like this line has been split off into more than one line. > what is rebase? anyways this seems simple enough to do by hand, but i > want to learn mercurial, so I wouldn't might if any one can explain > how to make hg patch work. Your attempt at patching failed because the patch you were trying to apply depends on another patch or ticket. -- Regards Minh Van Nguyen --~--~---------~--~----~------------~-------~--~----~ To post to this group, send an email to sage-devel@googlegroups.com To unsubscribe from this group, send an email to sage-devel-unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/sage-devel URLs: http://www.sagemath.org -~----------~----~----~----~------~----~------~--~---
