On Nov 22, 2007 7:59 PM, Nathan Dunfield <[EMAIL PROTECTED]> wrote: > > Try doing > > > > sage: hg_scripts.merge() > > sage: hg_scripts.commit() > > > > and answer any interactive questions. ... > If I follow the suggestion of .merge() I get > > sage: hg_scripts.update() > cd "/pkgs/sage-2.7.1/local/bin" && hg update > abort: untracked local file 'sage-wiki' differs from remote version
See where it says "abort: <a reason>". It's aborting at that point. If you do rm SAGE_ROOT/local/bin/sage-wiki then do hg_scripts.update() again, it won't abort for that reason and you'll get the new hg repo for scripts merged in. -- William --~--~---------~--~----~------------~-------~--~----~ 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-devel URLs: http://sage.scipy.org/sage/ and http://modular.math.washington.edu/sage/ -~----------~----~----~----~------~----~------~--~---
