On 05/27/2011 08:31 AM, Pauli Virtanen wrote: > On Fri, 27 May 2011 07:29:15 -1000, Eric Firing wrote: > [clip] >> 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. > > This probably was already clear to everybody, but you can find > out what came in the merges: > > If no force-pushes have been made, and only one merge was mistaken, > then there is a single merge commit that brings *all* of > the mistakenly merged commits into the commit graph. > > 1) Locate the merge that pulled lots of stuff, e.g., with > http://pav.iki.fi/tmp/git-merge-pull-history > git merge-pull-history -l upstream/v1.0.x|less >
Pauli, Nice--but what exactly is the meaning of "left" and "right"? Is it true that if all best practices were followed, there would be no "left to right" commits pulled? Is "master" always farthest left? Eric ------------------------------------------------------------------------------ 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
