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

I am testing the doc builds on v1.0.x when I noticed that it seems to think that it is version 1.1.0. Sure enough, somehow lib/matplotlib/__init__.py has __version__ defined as '1.1.0'. Meanwhile, I can't seem to finish a doc build on the v1.0.x branch, but I could with my docfix/smalltypos branc

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

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,

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

On 06/01/2011 08:26 AM, Michael Droettboom 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

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

On Wed, Jun 1, 2011 at 1:47 PM, Eric Firing wrote: > On 06/01/2011 08:26 AM, Michael Droettboom 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 les

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

On 06/01/2011 09:07 AM, Benjamin Root wrote: > > > On Wed, Jun 1, 2011 at 1:47 PM, Eric Firing > wrote: > > On 06/01/2011 08:26 AM, Michael Droettboom wrote: > > Yes, it seems that the v1.0.x got hosed somehow back in early > May. Eric > > Firing did so

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

On Wed, Jun 1, 2011 at 2:58 PM, Eric Firing wrote: > On 06/01/2011 09:07 AM, Benjamin Root wrote: > > > > > > On Wed, Jun 1, 2011 at 1:47 PM, Eric Firing > > wrote: > > > > On 06/01/2011 08:26 AM, Michael Droettboom wrote: > > > Yes, it seems that the v1.0.x g

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

Hi, On Wed, Jun 1, 2011 at 12:58 PM, Eric Firing wrote: >> The current practice worked very nicely with SVN (IMHO), and I think it > > (I recall that Mike had to rescue us more than once from svnmerge > confusions, at least during the earlier days.) I was just idly looking at the matplotlib netw

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

On Wed, Jun 1, 2011 at 6:38 PM, Matthew Brett wrote: > Hi, > > On Wed, Jun 1, 2011 at 12:58 PM, Eric Firing wrote: >>> The current practice worked very nicely with SVN (IMHO), and I think it >> >> (I recall that Mike had to rescue us more than once from svnmerge >> confusions, at least during the

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

On 06/01/2011 12:38 PM, Matthew Brett wrote: > Hi, > > On Wed, Jun 1, 2011 at 12:58 PM, Eric Firing wrote: >>> The current practice worked very nicely with SVN (IMHO), and I think it >> >> (I recall that Mike had to rescue us more than once from svnmerge >> confusions, at least during the earlier

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

Hi, On Wed, Jun 1, 2011 at 4:05 PM, Darren Dale wrote: > On Wed, Jun 1, 2011 at 6:38 PM, Matthew Brett wrote: >> Hi, >> >> On Wed, Jun 1, 2011 at 12:58 PM, Eric Firing wrote: The current practice worked very nicely with SVN (IMHO), and I think it >>> >>> (I recall that Mike had to rescue u

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

Hi, On Wed, Jun 1, 2011 at 4:06 PM, Eric Firing wrote: > On 06/01/2011 12:38 PM, Matthew Brett wrote: >> Hi, >> >> On Wed, Jun 1, 2011 at 12:58 PM, Eric Firing  wrote: The current practice worked very nicely with SVN (IMHO), and I think it >>> >>> (I recall that Mike had to rescue us more th