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
On Thu, Dec 11, 2008 at 8:25 AM, Michael Droettboom md...@stsci.edu 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
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 jdh2...@gmail.com wrote:
On Thu, Dec 11, 2008 at 8:25 AM, Michael Droettboom md...@stsci.edu wrote:
And I'll try and get the maintenance
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 cwm...@gmail.com wrote:
0.98.5 source and bins are posted. Please try them out. John can
announce at his convenience.
- Charlie
On
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
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 achieve
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 thought
It looks like there was a slight oops making the branch.
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/%5Cv0_98_4_maint
points to one level above the source tree. See:
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
