> Try doing
>
> sage: hg_scripts.merge()
> sage: hg_scripts.commit()
>
> and answer any interactive questions.
This doesn't seem to do anything:
sage: hg_scripts.merge()
cd "/pkgs/sage-2.7.1/local/bin" && hg merge
abort: there is nothing to merge - use "hg update" instead
sage: hg_scripts.commit()
cd "/pkgs/sage-2.7.1/local/bin" && hg diff | less
cd "/pkgs/sage-2.7.1/local/bin" && hg commit
nothing changed
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
More to the point, I do recall being asked some questions by "hg"
during the upgrade process ("(k)eep or (d)iscard" or similar). I
didn't pay much attention to them, but I guess I should have ;-).
Nathan
--~--~---------~--~----~------------~-------~--~----~
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/
-~----------~----~----~----~------~----~------~--~---
