If you've made your changes in sage-main, it will try and merge them in automatically when you do sage -upgrade. You have to check in your local changes first. Probably the safest way is to re-name your current sage-main to something else (e.g. sage-old). Then do a sage - upgrade, and it will create a fresh sage-main. You can then "pull" your changes manually from sage-old into sage-main using hg_sage (from within sage) or sage -hg [command] (from the command line). To be more explicit,
cd sage-old sage -hg commit cd sage-main sage -hg incoming ../sage-old [list of all the changes you made] sage -hg pull ../sage-old [applies sage-old changes to sage-main branch] sage -hg merge If the merge goes well do sage -hg commit Depending on how often you make changes, you may want to look into hg's branch cloning abilities. If you think your changes would be of general interest, submit a patch and you may get them bundled with the next sage -upgrade :). On Mar 27, 2007, at 11:26 PM, Kyle Schalm wrote: > pardon my ignorance, as i'm sure it's been explainedbefore, but if > i've made local changes to the sage code, what's the proper way to > upgrade? if i type "sage -upgrade", will it clobber my changes? how > do i > "merge in" the new features in going from, say, 2.3 to 2.4.1? > thanks. > kyle > > > --~--~---------~--~----~------------~-------~--~----~ 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://sage.scipy.org/sage/ and http://modular.math.washington.edu/sage/ -~----------~----~----~----~------~----~------~--~---
