#9433: Put more files under revision control.
------------------------------------------------------------+---------------
Reporter: jhpalmieri | Owner: tbd
Type: enhancement | Status:
needs_work
Priority: blocker | Milestone:
sage-4.7
Component: distribution | Keywords:
Author: John Palmieri | Upstream: N/A
Reviewer: Leif Leonhardy, Volker Braun, Jeroen Demeyer | Merged:
Work_issues: |
------------------------------------------------------------+---------------
Comment(by vbraun):
I'm in favor of the following third option:
1. The first thing that `sage-update` should do is to commit any
outstanding changes and, in particular, abort if there is a patch queue
applied. So you are safe even if you forgot to commit your changes.
1. Then `sage-update` overwrites some critical files for its operation.
1. Finally, the `sage_root` spkg is installed and its `spkg-install`
overwrites the remaining non-critical files in the root repository. I'd
rather be guaranteed to have a clean slate after update than dying in the
middle of the update because the attempted merge fails.
So if you had any uncommitted changes before updating, you'll end up with
two commit messages. The more individual commits the better. The only
drawback is that if you had made modifications to the root repository that
you want to keep and you are not using patch queues, then you now have to
extract your changes as a patch from the repository and apply that patch.
I think thats acceptable since, I think, most developers use patch queues
and I don't expect too frequent edits to the root repository.
If that doesn't convince you, I'd prefer option number 1 as my second
choice :-)
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/9433#comment:147>
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.
