On 05/27/2011 05:02 AM, Michael Droettboom wrote: > On 05/26/2011 03:19 PM, Eric Firing wrote: >> >> Mike, >> >> I think you did--unintentionally! If you look at the graph with qgit >> (or presumably any other such tool) in the vicinity of your commits on >> May 6, you will see that this one >> >> a50874b711983cba505ecdb2801c4996eccf3812 >> >> made v1.0.x branch off of master; the v1.0.x line was broken by the >> previous commit. To confirm that this break had the effect of >> propagating the change in _png.cpp into what is now v1.0.x, you can look >> at the diff between two commits on "v1.0.x", one of which is a bit >> before the break, the other after: >> >> git diff 069c21d 0e6dad src/_png.cpp >> >> You will see that the file was changed. >> >> Eric >> > I'm still not sure what happened there, and even less sure how to > resolve it. Does this mean we have a bunch of other things from master > in v1.0.x as well?
Mike, I wouldn't worry about it. It seems likely that other things from master did leak into v1.0.x, but at this point I don't think it matters. v1.0.x and master both build and run (or did last time I checked). The division between the two is somewhat arbitrary anyway. Tracking down and reversing the leakage, if there is any other than the _png.cpp change (which certainly does no harm in v1.0.x), would not be worthwhile. Better to just move forward, make improvements, and get some good releases out. Eric > > Mike > ------------------------------------------------------------------------------ vRanger cuts backup time in half-while increasing security. With the market-leading solution for virtual backup and recovery, you get blazing-fast, flexible, and affordable data protection. Download your free trial now. http://p.sf.net/sfu/quest-d2dcopy1 _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
