#15781: Increase Performance of possible_periods in Projective Morphism
-------------------------------------+-------------------------------------
Reporter: drose | Owner: drose
Type: enhancement | Status: needs_work
Priority: minor | Milestone: sage-6.3
Component: algebraic | Resolution:
geometry | Merged in:
Keywords: possible_periods, | Reviewers: Ben Hutz, Joao
cython | Alberto de Faria
Authors: Dillon Rose | Work issues:
Report Upstream: N/A | Commit:
Branch: | 5094e43ea32d0c6d75fe28568fc4e5bc2533cb3d
u/bhutz/ticket/15781 | Stopgaps:
Dependencies: #15780 |
-------------------------------------+-------------------------------------
Comment (by nbruin):
Replying to [comment:25 bhutz]:
> We tried to undo that by untracking the file and then rebasing. How do
we rewrite the history so that .c file is not included?
Probably something like `git rebase -i 6.2.rc0` (what you called rebases
in history were probably merges) and then edit a lot of "pick" to be
"squash" instead. If you can squash everything between the addition and
the removal of the `.c` file, you'll have the easiest time. If you want to
preserve some of the individual commits in between, you'll have to see if
you can reorder them.
You'll basically be producing a "fresh" branch that introduces the commits
you want to have in there and not the ones you don't. Of course, anybody
who has based work on commits you're removing, will have merge conflicts
with your new branch, so hopefully no-one did. That's why usually merging
produces less severe conflicts and is therefore recommended, but when you
really want to ''remove'' things from history, you have to rebase.
--
Ticket URL: <http://trac.sagemath.org/ticket/15781#comment:26>
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.
