Re: [matplotlib-devel] 98.4 maintenance branch

2008-12-12 Thread Michael Droettboom
Done. I also cleaned up the svnmerge docs in doc/devel/coding_guide.rst What we don't currently have is a way to merge fixes from 0.91.x to 0.98.5. It's been a long time since 0.91.x has seen any love, so I'm not too concerned. Just be aware of it -- bug fixes on 0.91.x may need to be manual

Re: [matplotlib-devel] 98.4 maintenance branch

2008-12-11 Thread John Hunter
Michael, Will you create the branch and set up the svn merge properties? Thanks Charlie, JDH Sent from my iPhone On Dec 11, 2008, at 7:35 PM, "Charlie Moad" wrote: > 0.98.5 source and bins are posted. Please try them out. John can > announce at his convenience. > > - Charlie > > On Thu, Dec

Re: [matplotlib-devel] 98.4 maintenance branch

2008-12-11 Thread Charlie Moad
0.98.5 source and bins are posted. Please try them out. John can announce at his convenience. - Charlie On Thu, Dec 11, 2008 at 12:15 PM, John Hunter wrote: > On Thu, Dec 11, 2008 at 8:25 AM, Michael Droettboom wrote: > >>> And I'll try and get the maintenance branch right next time :-) >> >>

Re: [matplotlib-devel] 98.4 maintenance branch

2008-12-11 Thread John Hunter
On Thu, Dec 11, 2008 at 8:25 AM, Michael Droettboom wrote: >> And I'll try and get the maintenance branch right next time :-) > > All of the above sounds good to me. I will be traveling to my conference starting at noon, so will be in sporadic, light email contact for the next few days. Charlie

Re: [matplotlib-devel] 98.4 maintenance branch

2008-12-11 Thread Michael Droettboom
John Hunter wrote: > > > On Wed, Dec 10, 2008 at 5:43 PM, Michael Droettboom <[EMAIL PROTECTED] > > wrote: > > Hmm... Seems Thunderbird butchered my long URLs. > > Anyway, the problem is worse than I thought. Since the branch was > created from trunk/ to bran

Re: [matplotlib-devel] 98.4 maintenance branch

2008-12-10 Thread John Hunter
On Wed, Dec 10, 2008 at 5:43 PM, Michael Droettboom <[EMAIL PROTECTED]> wrote: > Hmm... Seems Thunderbird butchered my long URLs. > > Anyway, the problem is worse than I thought. Since the branch was created > from trunk/ to branches/v0_98_4_maint/, svnmerge.py will only merge from one > of those

Re: [matplotlib-devel] 98.4 maintenance branch

2008-12-10 Thread Michael Droettboom
Hmm... Seems Thunderbird butchered my long URLs. Anyway, the problem is worse than I thought. Since the branch was created from trunk/ to branches/v0_98_4_maint/, svnmerge.py will only merge from one of those to the other. What we really want to be able to do is merge from branches/v0_98_4_ma

Re: [matplotlib-devel] 98.4 maintenance branch

2008-12-10 Thread Michael Droettboom
It looks like there was a slight "oops" making the branch. https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/ v0_98_4_maint points to one level above the source tree. See: http://matplotlib.svn.sourceforge

Re: [matplotlib-devel] 98.4 maintenance branch

2008-12-10 Thread John Hunter
On Wed, Dec 10, 2008 at 11:30 AM, Michael Droettboom <[EMAIL PROTECTED]>wrote: > > This will make merging slightly easier, (since the -S parameter is not > required), and it is generally good practice in the long run to not keep > extra branches lying around. I'm happy to make this change, but th

Re: [matplotlib-devel] 98.4 maintenance branch

2008-12-10 Thread Michael Droettboom
John Hunter wrote: > Since we already have a bug in the 98.4 release, we can anticipate > needing to do a bugfix release accumulating all the bugs we fix in the > next week (presuming we don't discover any critical bugs which would > require us to push out a fix earlier). To make sure we achiev

[matplotlib-devel] 98.4 maintenance branch

2008-12-10 Thread John Hunter
Since we already have a bug in the 98.4 release, we can anticipate needing to do a bugfix release accumulating all the bugs we fix in the next week (presuming we don't discover any critical bugs which would require us to push out a fix earlier). To make sure we achieve maximal stability, I have cr