#4342: [with patch; positive review, needs rebase] Add legends to plot.py
-------------------------+--------------------------------------------------
Reporter: anakha | Owner: anakha
Type: enhancement | Status: assigned
Priority: major | Milestone: sage-3.4.1
Component: graphics | Resolution:
Keywords: |
-------------------------+--------------------------------------------------
Changes (by mabshoff):
* summary: [with patch; positive review] Add legends to plot.py => [with
patch; positive review, needs rebase] Add
legends to plot.py
Comment:
Hi Arnaud,
after applying #4878 and #4884 to my Sage 3.3.alpha0 merge tree I am
seeing rejects with trac_4342_v3.2.patch:
{{{
mabsh...@geom:/scratch/mabshoff/sage-3.3.alpha0/devel/sage$ patch -p1
--dry-run < trac_4342_v3.2.patch
patching file sage/plot/arrow.py
patching file sage/plot/bar_chart.py
patching file sage/plot/circle.py
patching file sage/plot/contour_plot.py
Hunk #1 succeeded at 54 with fuzz 2 (offset 1 line).
Hunk #2 succeeded at 73 (offset -13 lines).
Hunk #3 FAILED at 116.
Hunk #4 succeeded at 177 (offset -11 lines).
1 out of 4 hunks FAILED -- saving rejects to file
sage/plot/contour_plot.py.rej
patching file sage/plot/disk.py
patching file sage/plot/line.py
patching file sage/plot/plot.py
Hunk #3 succeeded at 390 with fuzz 2.
Hunk #4 succeeded at 618 (offset 27 lines).
Hunk #5 succeeded at 726 (offset 27 lines).
Hunk #6 succeeded at 961 (offset 27 lines).
Hunk #7 succeeded at 982 (offset 27 lines).
Hunk #8 succeeded at 993 (offset 27 lines).
Hunk #9 succeeded at 1010 (offset 27 lines).
Hunk #10 succeeded at 1078 (offset 27 lines).
Hunk #11 succeeded at 1128 (offset 27 lines).
Hunk #12 succeeded at 1200 with fuzz 1 (offset 27 lines).
Hunk #13 succeeded at 1303 with fuzz 2 (offset 105 lines).
Hunk #14 succeeded at 1400 (offset 104 lines).
Hunk #15 succeeded at 1545 (offset 104 lines).
Hunk #16 succeeded at 1582 (offset 104 lines).
Hunk #17 succeeded at 1671 (offset 104 lines).
Hunk #18 succeeded at 1699 (offset 104 lines).
Hunk #19 succeeded at 1721 (offset 104 lines).
Hunk #20 succeeded at 1800 (offset 104 lines).
Hunk #21 succeeded at 1886 (offset 104 lines).
patching file sage/plot/point.py
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 24 (offset 9 lines).
Hunk #3 succeeded at 39 (offset 9 lines).
Hunk #4 succeeded at 106 (offset 9 lines).
Hunk #5 succeeded at 131 (offset 13 lines).
Hunk #6 succeeded at 140 (offset 13 lines).
1 out of 6 hunks FAILED -- saving rejects to file sage/plot/point.py.rej
patching file sage/plot/polygon.py
patching file sage/plot/primitive.py
}}}
Can you rebase the patch against 3.2.3+#4878 and #4884?
Cheers,
Michael
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/4342#comment:13>
Sage <http://sagemath.org/>
Sage - Open Source Mathematical Software: Building the Car Instead of
Reinventing the Wheel
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/sage-trac?hl=en
-~----------~----~----~----~------~----~------~--~---
