#6042: [with patch, needs rebasing] Bring doctests of modular/modsym/ambient.py
up
to 100%
---------------------------+------------------------------------------------
Reporter: cremona | Owner: craigcitro
Type: defect | Status: new
Priority: major | Milestone: sage-4.0.1
Component: modular forms | Keywords: documentation, modular symbols
---------------------------+------------------------------------------------
Comment(by cremona):
This is just sickening. I must have spent over 10 hours in the last week
documenting this file, resulting in a patch over 2000 lines long, and 100%
doctest coverage. But now I cannot apply it since after the 7 patches on
3 tickets which David warned me about (#5736, #4357 and #5250 all already
merged in 4.0alpha0, in that order) I get this mess:
{{{
j...@ubuntu%sage -hg qpush
applying trac_6042.patch
patching file sage/modular/modsym/ambient.py
Hunk #17 FAILED at 800
Hunk #25 FAILED at 1291
Hunk #45 FAILED at 2230
Hunk #60 FAILED at 2829
Hunk #61 FAILED at 2836
Hunk #65 FAILED at 2962
Hunk #71 FAILED at 3195
7 out of 76 hunks FAILED -- saving rejects to file
sage/modular/modsym/ambient.py.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
Errors during apply, please fix and refresh trac_6042.patch
}}}
I'm really not sure I can be bothered to mess with this any more. Is
there any system to actually help one merge conflicting patches sensibly?
I have never managed to get things like k3diff to work.
I will at least upload my patch so that it does not get lost, but I have
other things to do.
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/6042#comment:1>
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
-~----------~----~----~----~------~----~------~--~---
