#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 ncohen):
> Huh? Are we back to the hg-like patch quilt? How come "#15489 is not
applied" when I check this one out?
git does not manage dependencies based on branch names. This "branch" does
not depend on branch "15489". The first commit of this branch depends on
the last commit of branch 15489 when it was created, but since that time I
fixed the problem by adding another commit at the end of branch 15489,
which is totally unrelated to this branch.
Thus, when you apply this branch, only the commits that actually depend on
it are applied. Not the commit that were added later on that branch. Then
again, git does not do anything based on branch names. Commit is the only
thing that it sees.
> 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
Pull is equivalent to "fetch + merge". So it will merge this branch atop
of #15489. This way everything that is currently in #15489 will coexist
with everything which is in #15521. This is what Volker does when he
builds a release : he pulls patches one after the other starting from the
previous release.
Note that there is a "clean" way out : I can checkout this branch, pull
#15489 (which will merge with this branch all commits from #15489 which
are not already part of it) then update this branch with it. It's just
that my Sage is compiling at the moment and I can't do it right now, so if
you are satisfied with this explanation... `:-P`
Nathann
--
Ticket URL: <http://trac.sagemath.org/ticket/15521#comment:22>
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.
