That's weird. Obviously I would not have poseted the patches at all if they had not passed all tests on my machine.
Anyway, by the time I came home and could read email you and William had fixed it all, so thanks a lot for that -- and next time i'll try to make it easier. John On 21/02/2008, mabshoff <[EMAIL PROTECTED]> wrote: > > > > On Feb 21, 10:24 am, "John Cremona" <[EMAIL PROTECTED]> wrote: > > Michael, > > > > Is there anything I can do to help with 1946? It's now a month since > > I wrote that stuff and the more releases that go by before it is > > merged the harder it will be. Or will it be easier (for you!) to wait > > until 2.10.2 is released without it and then redo the patch based on > > that? > > > > John > > > Hi John, > > we tried applying the patch and I get massive rejects in the > docstrings with your patch series as well as the bundle William posted > against 2.10.2.alpha1. Those rejects are usually easy to resolve > manually, but I am not somebody with enough expertise to do that. It > also looks like newlines might be involved somehow, which does > surprise me. > > If you have a rebased series of patches against 2.10.2.alpha2 I am > sure that they will either go in before 2.10.2.final or right at the > start of the 2.10.3 release cycle, i.e. before anything else in that > area has a change to be merge, so that there is 0% potential for merge > conflict. > > Cheers, > > Michael > > > > -- John Cremona --~--~---------~--~----~------------~-------~--~----~ To post to this group, send email to sage-devel@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/sage-devel URLs: http://www.sagemath.org -~----------~----~----~----~------~----~------~--~---
