#15521: Deprecations: default LP variables will become real instead of
nonnegative
-------------------------------------+-------------------------------------
Reporter: ncohen | Owner:
Type: enhancement | Status: needs_review
Priority: major | Milestone: sage-6.2
Component: linear | Resolution:
programming | Merged in:
Keywords: | Reviewers: Benjamin Jones
Authors: Nathann Cohen | Work issues:
Report Upstream: N/A | Commit:
Branch: u/ncohen/15521 | e4acecb4779921e094ffb1e403144f8924cfabf8
Dependencies: #15489 | Stopgaps:
-------------------------------------+-------------------------------------
Comment (by dimpase):
Replying to [comment:22 ncohen]:
> > EDIT: I don't see how to make this consistent without a manual rebase:
if I "apply" #15489 by checking it out, this "application" will be
reversed upon checking out this ticket, isn't it?
>
> Indeed. If you want both, what you should do is :
> 1) checkout #15489
> 2) pull #15521
this is what I get if I try this at branch 15489:
{{{
$ git merge 15521
Auto-merging src/sage/numerical/mip.pyx
Auto-merging src/sage/graphs/generic_graph.py
CONFLICT (content): Merge conflict in src/sage/graphs/generic_graph.py
Removing src/sage/combinat/sf/kschur.py
Removing build/pkgs/gap/patches/cflags.patch
Removing build/pkgs/cython/patches/gdbout.patch
Removing build/pkgs/cython/patches/build_dir.patch
Automatic merge failed; fix conflicts and then commit the result.
}}}
looks like an automatic clean merge won't fly...
--
Ticket URL: <http://trac.sagemath.org/ticket/15521#comment:23>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/groups/opt_out.
