Re: [matplotlib-devel] v1.0.x branch seems confused

[Darren D. <dsd...@gm...>]

Mike,

On Wed, Jun 1, 2011 at 2:26 PM, Michael Droettboom <md...@st...> wrote:
> Yes, it seems that the v1.0.x got hosed somehow back in early May.  Eric
> Firing did some spelunking and traced it to a push I made, but I'm not sure
> what I did wrong, and I'm even less sure how to fix it.  If someone with
> more git-fu wants to investigate and repair it, that would be fantastic, but
> I'm afraid to touch it myself.

I'm taking a guess here: gtk_crash was branched off of master, but
perhaps the pull request was registered against the v1.0.x branch. In
any case, gtk_crash was merged with v1.0.x. I've done something
similar myself, but I always merge into a clean local copy of v1.0.x
or master and inspect the history graph, so I noticed my mistake
before I actually pushed the changes.

I have a little time now, maybe something can be done to correct it.