#18909: fuzzy output of sage -dev makes doctests fail
-------------------------+----------------------------
Reporter: rws | Owner:
Type: defect | Status: new
Priority: major | Milestone: sage-6.8
Component: symbolics | Keywords:
Merged in: | Authors:
Reviewers: | Report Upstream: N/A
Work issues: | Branch:
Commit: | Dependencies:
Stopgaps: |
-------------------------+----------------------------
{{{
sage -t --long src/sage/dev/sagedev.py
**********************************************************************
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
}}}
--
Ticket URL: <http://trac.sagemath.org/ticket/18909>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/d/optout.
