On Dec 8, 2008, at 11:58 AM, William Stein wrote: > On Mon, Dec 8, 2008 at 11:54 AM, Robert Bradshaw > <[EMAIL PROTECTED]> wrote: >> >> >> We can detect whether or not a merge will be needed, just to a "hg >> incoming" and "hg diff" from sage-main to the newly unpacked sage- >> x.y.z spkg. If these are empty, it would behave as normal. Otherwise, >> it would either build somewhere other than sage-main, or (my >> preference) move sage-main to sage-main-backupN and install a >> pristine sage-main. Thus a full rebuild -ba would only be required if >> people edited their sage-main. > > This is exactly the behavior that I, as an expert, would not want.
To clarify, you want it to attempt an unverified merge half way through the upgrade process? The only times I have ever been bitten by upgrade is due to a modified sage-main, so I always try and leave my sage-main directory pristine and work in clones. > Since the upgrade command is currently aimed at experts (imho), maybe > this is an argument for having two commands: > > sage -expert_upgrade > sage -upgrade Yes, what I am suggesting is certainly aimed more at non-experts (e.g. casual/starting developers, though if it became stable enough I bet most people would rather be able to upgrade than re-download/ install a new Sage every time). > where the first is the current sage -upgrade command (except always > the *current* hg sage branch is upgraded), and the second is maybe > more what Robert is suggesting. The second would still have the big > warning about this being dangerous. > > Of course, maintaining two types of upgrade command is more work, and > potentially confusing. Thoughts? What about an option to the upgrade script, e.g. sage -upgrade [-b branch] which would upgrade specified branch inplace if specified? - Robert --~--~---------~--~----~------------~-------~--~----~ To post to this group, send email to sage-devel@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/sage-devel URLs: http://www.sagemath.org -~----------~----~----~----~------~----~------~--~---
