#7082: [with patch; needs work] SageNB -- WorksheetProcess is an old-style class
----------------------+-----------------------------------------------------
Reporter: timdumol | Owner: boothby
Type: defect | Status: new
Priority: major | Milestone: sage-4.1.3
Component: notebook | Keywords: sagenb notebook
Reviewer: | Author: Tim Dumol
Merged: |
----------------------+-----------------------------------------------------
Comment(by was):
I applied this patch and there are a spectacular number of merge
conflicts:
{{{
flat:sagenb wstein$ hg import trac_7082-old-style-class.patch
applying trac_7082-old-style-class.patch
patching file sagenb/interfaces/reference.py
Hunk #1 FAILED at 79
1 out of 1 hunks FAILED -- saving rejects to file
sagenb/interfaces/reference.py.rej
patching file sagenb/interfaces/reference.py
Hunk #1 FAILED at 79
1 out of 1 hunks FAILED -- saving rejects to file
sagenb/interfaces/reference.py.rej
patching file sagenb/interfaces/worksheet_process.py
Hunk #1 FAILED at 17
1 out of 1 hunks FAILED -- saving rejects to file
sagenb/interfaces/worksheet_process.py.rej
patching file sagenb/misc/sageinspect.py
Hunk #1 FAILED at 11
Hunk #2 FAILED at 223
Hunk #3 FAILED at 265
Hunk #4 FAILED at 307
Hunk #5 succeeded at 396 with fuzz 2 (offset 4 lines).
Hunk #6 FAILED at 624
Hunk #7 FAILED at 663
6 out of 7 hunks FAILED -- saving rejects to file
sagenb/misc/sageinspect.py.rej
patching file sagenb/interfaces/reference.py
Hunk #1 FAILED at 79
1 out of 1 hunks FAILED -- saving rejects to file
sagenb/interfaces/reference.py.rej
patching file sagenb/interfaces/worksheet_process.py
Hunk #1 FAILED at 17
1 out of 1 hunks FAILED -- saving rejects to file
sagenb/interfaces/worksheet_process.py.rej
patching file sagenb/misc/sageinspect.py
Hunk #1 FAILED at 11
Hunk #2 FAILED at 223
Hunk #3 FAILED at 265
Hunk #4 FAILED at 307
Hunk #5 succeeded at 401 with fuzz 2 (offset 9 lines).
Hunk #6 FAILED at 624
Hunk #7 FAILED at 663
6 out of 7 hunks FAILED -- saving rejects to file
sagenb/misc/sageinspect.py.rej
patching file sagenb/interfaces/worksheet_process.py
Hunk #1 FAILED at 17
1 out of 1 hunks FAILED -- saving rejects to file
sagenb/interfaces/worksheet_process.py.rej
patching file sagenb/misc/sageinspect.py
Hunk #1 FAILED at 11
Hunk #2 FAILED at 223
Hunk #3 FAILED at 265
Hunk #4 FAILED at 307
Hunk #5 succeeded at 406 with fuzz 2 (offset 14 lines).
Hunk #6 FAILED at 624
Hunk #7 FAILED at 663
6 out of 7 hunks FAILED -- saving rejects to file
sagenb/misc/sageinspect.py.rej
abort: patch failed to apply
}}}
Could you rebase it against my repo?
http://sage.math.washington.edu:8100/
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/7082#comment:1>
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 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
-~----------~----~----~----~------~----~------~--~---
