#10988: Make `sage -upgrade` more developer-friendly by removing merging
-----------------------+----------------------------------------------------
Reporter: kini | Owner:
Type: defect | Status: new
Priority: major | Milestone: sage-4.7
Component: scripts | Keywords:
Author: | Upstream: N/A
Reviewer: | Merged:
Work_issues: |
-----------------------+----------------------------------------------------
Description changed by kini:
Old description:
> The $SAGE_ROOT/local/bin/sage-update script should allow upgrading
> between alphas.
>
> There should be a way to tell it to avoid pointless merges between
> released alphas and their equivalent, build-milestone alphas inside newer
> alphas, for those of us who don't want or need anything to be merged.
> Since alphas are currently released based on the previous stable release
> rather than the previous alpha, there could be an option (maybe even a
> default) to strip the old alpha's branch from the stable version after
> installing the new alpha. There is a general procedure I currently follow
> to move all my patches from old alphas to new alphas which could be
> automated as well.
>
> I marked this as a defect as I think it seems reasonable to expect `sage
> -upgrade` to be able to do stuff like this (or at least be usable for
> upgrading between alphas), but if you disagree, feel free to change it to
> a feature request.
New description:
`sage -upgrade` should not forcibly merge the local working directory with
upstream files when installing updated SPKGs of the four main tracked
repositories of the sage distribution.
It's generally a bad idea because, as I see it, the current workflow of
sage development involves using Mercurial mainly 1) to string together
patches to make releases, and 2) to create patches to upload to trac. Even
if `sage -upgrade` merges local changes into the tree, those changes will
never make it into the main sage distribution unless we dig them out and
put them in a patch, which anyway involves unmerging of some sort.
More practically speaking, this merging behavior also currently causes
`sage -upgrade` to fail when attempting to upgrade from one alpha version
of sage to another, which is a pain since the sage distribution is both
relatively large and slow to build from scratch.
Since alphas are currently released based on the previous stable release
rather than the previous alpha, there could also be an option (maybe even
a default) to strip the old alpha's branch from the stable version after
installing the new alpha, or even automatically rebasing local changes.
There is a general procedure I currently follow to move all my patches
from old alphas to new alphas which could probably be automated as well.
I marked this as a defect as I think it seems reasonable to expect `sage
-upgrade` to be able to do stuff like this (or at least be usable for
upgrading between alphas), but if you disagree, feel free to change it to
a feature request.
--
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/10988#comment:3>
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 post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/sage-trac?hl=en.
