7.2 Updating To the Latest Official Sage Library Source Code

If you're wary of messing things up, before typing the commands explained below, first type from the command line sage -clone test. To switch back to your main repository (the default), type sage -b main.

To update to the latest Sage Mercurial source code type hg_sage.pull(). You may have to type hg_sage.update().

At this stage, you might get a message like:

remote changed .hgtags which local deleted
(k)eep or (d)elete?
Type k <RETURN>. You might then get
remote changed export which local deleted
(k)eep or (d)elete?
Type k <RETURN>.

You might then get merging sage/... Now kdiff3 opens with some text highlighted in yellow and red. The bar at the bottom says "Number of remaining unsolved conflicts: ...". The conflict appears to be in the file named in the lower part of the kdiff3 window. Clicked on "merge" on the top bar, pick one of the options in the pop-down menu, then click on "save" and quit.

If you don't have kdiff3, install it with apt get kdiff3 or yum install kdiff3.

If it says you need to, type hg_sage.commit() to finish updating your mercurial repository.

See About this document... for information on suggesting changes.