Re: [matplotlib-devel] v1.0.x RIP, long live v1.0.x-maint

2011-06-13 Thread Michael Droettboom
Sorry for the delayed reply -- I've been on vacation. Thanks so much for untangling this mess. It looks great. Mike On 06/02/2011 07:46 PM, Darren Dale wrote: > Folks, > > We had some minor confusion with a merge a few weeks back, which > pulled much of the master branch into the v1.0.x mainten

Re: [matplotlib-devel] v1.0.x RIP, long live v1.0.x-maint

2011-06-04 Thread Benjamin Root
On Sat, Jun 4, 2011 at 11:09 AM, Benjamin Root wrote: > On Fri, Jun 3, 2011 at 6:15 PM, John Hunter wrote: > >> >> >> On Fri, Jun 3, 2011 at 3:37 PM, Benjamin Root wrote: >> >>> By the way, whoever is the one to push the docs up to sourceforge, you >>> can now do so from the v1.0.x-maint branch

Re: [matplotlib-devel] v1.0.x RIP, long live v1.0.x-maint

2011-06-04 Thread Benjamin Root
On Fri, Jun 3, 2011 at 6:15 PM, John Hunter wrote: > > > On Fri, Jun 3, 2011 at 3:37 PM, Benjamin Root wrote: > >> By the way, whoever is the one to push the docs up to sourceforge, you can >> now do so from the v1.0.x-maint branch. I have built it on my computer and >> all of my own changes ap

Re: [matplotlib-devel] v1.0.x RIP, long live v1.0.x-maint

2011-06-03 Thread John Hunter
On Fri, Jun 3, 2011 at 3:37 PM, Benjamin Root wrote: > By the way, whoever is the one to push the docs up to sourceforge, you can > now do so from the v1.0.x-maint branch. I have built it on my computer and > all of my own changes appear correct. I couldn't test *everything* (my > LaTeX setup i

Re: [matplotlib-devel] v1.0.x RIP, long live v1.0.x-maint

2011-06-03 Thread Benjamin Root
On Fri, Jun 3, 2011 at 1:52 PM, Eric Firing wrote: > On 06/03/2011 07:21 AM, Benjamin Root wrote: > > > P.S. : As an interesting aside to what caused me to find this mistake... > > My docs were still not building correctly, although now that the v1.0.x > > branch is fixed, it didn't have the mult

Re: [matplotlib-devel] v1.0.x RIP, long live v1.0.x-maint

2011-06-03 Thread Eric Firing
On 06/03/2011 07:21 AM, Benjamin Root wrote: > P.S. : As an interesting aside to what caused me to find this mistake... > My docs were still not building correctly, although now that the v1.0.x > branch is fixed, it didn't have the multiprocessing trick that is in > master. Therefore, when the er

Re: [matplotlib-devel] v1.0.x RIP, long live v1.0.x-maint

2011-06-03 Thread Darren Dale
On Fri, Jun 3, 2011 at 1:21 PM, Benjamin Root wrote: > On Thu, Jun 2, 2011 at 6:46 PM, Darren Dale wrote: >> >> Folks, >> >> We had some minor confusion with a merge a few weeks back, which >> pulled much of the master branch into the v1.0.x maintenance branch. I >> created a new v1.0.x-maint bra

Re: [matplotlib-devel] v1.0.x RIP, long live v1.0.x-maint

2011-06-03 Thread Benjamin Root
On Thu, Jun 2, 2011 at 6:46 PM, Darren Dale wrote: > Folks, > > We had some minor confusion with a merge a few weeks back, which > pulled much of the master branch into the v1.0.x maintenance branch. I > created a new v1.0.x-maint branch that rolled back all of the changes > from that point on, a

[matplotlib-devel] v1.0.x RIP, long live v1.0.x-maint

2011-06-02 Thread Darren Dale
Folks, We had some minor confusion with a merge a few weeks back, which pulled much of the master branch into the v1.0.x maintenance branch. I created a new v1.0.x-maint branch that rolled back all of the changes from that point on, and cherry-picked all of the changes that were actually intended