Re: [matplotlib-devel] 98.4 maintenance branch

John Hunter wrote:
>
>
> On Wed, Dec 10, 2008 at 5:43 PM, Michael Droettboom <md...@st... 
> <mailto:md...@st...>> 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 to the other.  What we really want to
>     be able to do is merge from branches/v0_98_4_maint/matplotlib to
>     trunk/matplotlib (i.e. source tree to source tree, not from the
>     whole matplotlib universe to another), so the branch must be
>     created in the same way.  svnmerge does its magic by going back to
>     find how the branch was created, and if the merging doesn't match
>     the branch operation, it basically can't do anything.  Hope that
>     description makes sense.
>
>     This means, presently, in order to do a merge, one has to check
>     out the whole kit-and-caboodle with htdocs, py4science etc., and
>     not just the matplotlib source tree.
>
>     I would suggest fixing this creating a new branch just from the
>     source tree, and setting up merging from that to the trunk source
>     tree, and then retiring or deleting the current v0_98_4_maint
>     branch (if that's possible).
>
>
> Yes, this was just a screwup on my part when I made the branch; be 
> gentle, it was my first time.  I agree with your suggestion of just 
> deleting the branch and starting over. 
No worries.  These things can be hopelessly fiddly.
>
> Unfortunately, there is  a critical bug reported on the users list 
> where is GTKAgg is installed as the default backend on the windows 
> installer (I confirmed this for the win 2.5 win32 egg and assume the 
> problem is in the other win binaries too).  Charlie, did you perhaps 
> forget to set the tkagg backend in the setup.cfg config for the 
> windows installer (and make sure the configobj and traits are turned 
> off as Darren mentioned in another thread)?   I have deleted the win32 
> files from the sf release page. 
>
> Given that the win32 binaries have to be fixed ASAP and that the 
> branch is fubar, it may be in everyone's best interest to simply start 
> over.
> I've added Michael's font_manager and Jae-Joon's figure/subplot fixes 
> to the trunk at r6559 and bumped the version number to 0.98.5rc.  I 
> did another round of testing with these changes (including a nose test 
> for Jae-Joon's problem!) so Charlie if you have time to do another set 
> of binaries we can kill all these birds with one stone an just release 
> 0.98.5 (if you go this route, just remove the rc from the version num 
> and bump to 0.98.5)
>
> Or Charlie, if you do not have time for this in the next 24 hours, but 
> do have time to upload new win32 binaries from your existing build 
> dirs with the backend fixed, that is fine too and we can push out a 
> bug fix release with these other non-critical changes next week.  If 
> you decide to go this route, you should know that I may have 
> accidentally deleted the python 2.4 os x egg when deleting the win32 
> binaries,  because if there was one there isn't one there now :-(
>
> And if your new baby is requiring some attention and you don't have 
> time for either of these, let me know and I will simply hide the 98.4 
> release until we sort this out.
>
> And I'll try and get the maintenance branch right next time :-) 
All of the above sounds good to me.

Mike