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 *
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.
Rado
On Aug 6, 10:23 pm, Minh Nguyen <nguyenmi...@gmail.com> wrote:
> Hi Rado,
>
> On Fri, Aug 7, 2009 at 1:06 PM, Rado<rki...@gmail.com> wrote:
>
> > I hit sage -upgrade successfully, cloned sage and tried to patch but
> > got this...
>
> > r...@rado-desktop:~/sage-4.0.2/devel/sage-lp$ hg patch AllMIP.patch
> > applying AllMIP.patch
> > patching file sage/numerical/all.py
> > Hunk #1 FAILED at 0
> > 1 out of 1 hunks FAILED -- saving rejects to file sage/numerical/
> > all.py.rej
> > abort: patch failed to apply
>
> > any ideas :/
>
> What's the content of the following file?
>
> sage/numerical/all.py.rej
>
> A rebase of AllMIP.patch would solve the failure to patch.
>
> --
> 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
-~----------~----~----~----~------~----~------~--~---
