On 26 Okt., 17:15, William Stein <wst...@gmail.com> wrote:
> I just tried to upgrade from sage-4.7 to sage-4.7.1 on
> mod.math.washington.edu using "sage -upgrade", and get stopped by
>
> There are uncommitted changes in the Sage root repository. Aborting.
You evidently haven't tried to upgrade *from* a *devel* release
recently, which is even more annoying. ;-) (It is broken, but the
behaviour is worse, since during the build 'kdiff3' and the like pop
up multiple times.)
> Evidently, in (my?) sage-4.7, because of .hgignore missing something,
> this results in:
>
> wstein@mod:/usr/local/sage$ hg status |wc -l
> 7843
This also happens if you have (e.g.) any .txt file in
$SAGE_ROOT/; .log files in contrast happen to get ignored.
I don't recall where and when, but we already had some discussion on
that, e.g. that files unknown to Mercurial ("? ...") should be ignored
when checking whether there are uncommitted changes. Keshav, John?
> Anyway, this was part of trac http://trac.sagemath.org/sage_trac/ticket/9433.
> Of course, I'll just comment out the test in sage-update so I can get on with
> things:
>
> (1) comment out the " #sys.exit(2)" in "local/bin/sage-update"
There should at least be a '--force' option to 'sage --upgrade' which
is propagated to the spkgs which currently unconditionally try to
check in and merge outstanding changes.
> http://xkcd.com/963/
Fortunately you meanwhile almost never have to deal with that file
anymore. :-)
-leif
--
To post to this group, send an email to sage-devel@googlegroups.com
To unsubscribe from this group, send an email to
sage-devel+unsubscr...@googlegroups.com
For more options, visit this group at http://groups.google.com/group/sage-devel
URL: http://www.sagemath.org
