#16453: Cythonize quiver paths
-------------------------------------+-------------------------------------
Reporter: SimonKing | Owner:
Type: enhancement | Status: needs_work
Priority: major | Milestone: sage-6.4
Component: algebra | Resolution:
Keywords: | Merged in:
Authors: Simon King | Reviewers:
Report Upstream: N/A | Work issues: Rebase wrt #17564
Branch: | Commit:
public/ticket/16453 | e03b66156f5b5212bfeffc937887ae5c29a1a6ca
Dependencies: #15820 #17564 | Stopgaps:
-------------------------------------+-------------------------------------
Comment (by SimonKing):
Replying to [comment:88 jdemeyer]:
> I'm not going to discuss about the git stuff...
>
> (but personally: I would `merge --squash` this branch on top of #17564)
Since I tend to get things wrong in git, I need more details.
Do I understand correctly that you suggest to take all the commits from
here, squash them into one commit, and force-push here. Thus:
{{{
git checkout -b new_branch_for_here branch_17564
git merge --squash branch_from_here
git commit
git trac push --forced --ticket=16453
}}}
(or however a forced push is done).
I am not sure that that's what I want. If I understood correctly what
Nathann said, he as a reviewer prefers to have a sequence of commits each
addressing a single feature, and ideally there should be no merge commits
and no commits that simply revert the effect of previous mistaken commits.
If Nathann reads it: Would this be what you'd like to get?
So, perhaps
{{{
git checkout branch_from_here
git rebase -i branch_17564
}}}
followed by a forced push would be better, since then I can interactively
choose which commits from here to squash and which to preserve.
Anyway, I'd agree to force-push, even though #17435 is based on this
ticket. Probably I am the only one who is actively using these branches.
--
Ticket URL: <http://trac.sagemath.org/ticket/16453#comment:89>
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/d/optout.
