Building documentation fails on 5.4-rc2

[Andrea Lazzarotto]

Hi,

I'm trying to upgrade from Sage 5.4 rc0 to rc2.

A lot of stuff compiled fine, but then the installation failed when building documentation. In particular, when I try to build it I get some errors like this one:

andrea@farore:~/Scrivania/sage$ ./sage --docbuild --help
Traceback (most recent call last):
  File "/home/andrea/Scrivania/sage/devel/sage/doc/common/builder.py", line 12, in <module>
    from sage.misc.misc import sage_makedirs as mkdir
  File "/home/andrea/Scrivania/sage/local/lib/python2.7/site-packages/sage/misc/misc.py", line 144
    <<<<<<< local
     ^
SyntaxError: invalid syntax
andrea@farore:~/Scrivania/sage$

Also, the interactive session fails with this kind of error:

[...]
/home/andrea/Scrivania/sage/local/bin/ipy_profile_sage.py in <module>()
      1 import os
      2 if 'SAGE_CLEAN' not in os.environ:
----> 3     import sage.misc.misc
      4     from sage.misc.interpreter import preparser, _ip
      5     preparser(True)

SyntaxError: invalid syntax (misc.py, line 144)
Error importing ipy_profile_sage - perhaps you should run %upgrade?
WARNING: Loading of ipy_profile_sage failed.

<ERROR: name 'sage_prompt' is not defined>

Is there a way to fix it? Or do I have to download and re-compile the installation tarball from scratch?

Thank you!

Best regards,

--
Andrea Lazzarotto - http://andrealazzarotto.com

[Jeroen Demeyer]

On 2012-10-24 13:10, Andrea Lazzarotto wrote:
> <<<<<<< local

This looks like a marker from a failed merge.

[Andrea Lazzarotto]

Il giorno 24 ottobre 2012 13:41, Jeroen Demeyer <jdem...@cage.ugent.be> ha scritto:

This looks like a marker from a failed merge.

Probably you're right. I tried to understand what was the problem with mercurial and I tried the suggested "hg ...something" command for auto-fixing merging, but probably it didn't work. Is there a way to redo the merge?

Please apology if I'm missing something, at the beginning I thought it was sufficient to run a sage -upgrade with the URL. :)

Thank you.

[Andrea Lazzarotto]

2012/10/24 Andrea Lazzarotto <andrea.l...@gmail.com>

Please apology

Sorry, this should have been "I apology". :D

[Andrea Lazzarotto]

2012/10/24 Andrea Lazzarotto <andrea.l...@gmail.com>

Is there a way to redo the merge?

Finally I got it. I manually replaced the offending files from:

<<<<<<< local
[line A]
=======
[line B]
>>>>>>> other

With just [line B] and it worked. Thank you for pointing me in the right direction. ;)

Best regards,