Robert Bradshaw wrote: > On May 15, 2009, at 12:04 PM, Dag Sverre Seljebotn wrote: > >>> Hi, >>> >>> the large number of major changes in cython-devel induces a number of >>> merge >>> conflicts in cython-unstable. I'm very happy to see all those great >>> improvements all over the place, but could those who implemented them >>> please try to re-integrate them with the unstable branch? >> At least for what I should be doing: Because of time constraints I >> need to >> keep focus on cython-devel myself; I'll be happy to merge next week >> after >> the release is done. >> >> I don't think what's happened in -devel is a blocker for anything that >> should happen in unstable the next week? > > I just took a quick look and it seems most of the conflicts are due > to refactoring of the Code.py and code streams. Given your work in > the area it seems, Dag, that you're the one who would be best capable > of doing this, even if it has to wait 'till next week.
Done. -- Dag Sverre _______________________________________________ Cython-dev mailing list [email protected] http://codespeak.net/mailman/listinfo/cython-dev
