make distclean; make; make ptestlong fails on OpenSuSE 13 with
sage -t --long src/sage/dev/sagedev.py # 2 doctests failed
File "src/sage/dev/sagedev.py", line 1145, in sage.dev.sagedev.SageDev.pull
Failed example:
alice.pull()
Expected:
Merging the remote branch "u/bob/ticket/1" into the local branch
"ticket/1".
Automatic merge failed, there are conflicting commits.
<BLANKLINE>
Auto-merging alices_file
CONFLICT (add/add): Merge conflict in alices_file
<BLANKLINE>
Please edit the affected files to resolve the conflicts. When you are
finished,
your resolution will be commited.
Finished? [ok/Abort] abort
Got:
Merging the remote branch "u/bob/ticket/1" into the local branch
"ticket/1".
Automatic merge failed, there are conflicting commits.
<BLANKLINE>
Auto-merging alices_file
CONFLICT (add/add): Merge conflict in alices_file
Recorded preimage for 'alices_file'
<BLANKLINE>
Please edit the affected files to resolve the conflicts. When you are
finished, your resolution will be commited.
Finished? [ok/Abort] abort
They persist in manual invocation.
Note the difference in the "Please edit..." line. I had these before but
did not do a distclean. The other is in line 3130 and essentially the same.
--
You received this message because you are subscribed to the Google Groups
"sage-release" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to sage-release+unsubscr...@googlegroups.com.
To post to this group, send email to sage-release@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-release.
For more options, visit https://groups.google.com/d/optout.
