branching for 1.0

Although there are many active issues that are undergoing constant
work, none of these seem release critical and we can continue to
improve them on the branch and trunk as need be. Eric, who has been
doing the lion's share of the work managing, fixing and closing bugs,
feels like we are ready to go and so do I. So Michael, if you are
available, will you branch the trunk into a 1.0 maintenance branch,
and once the branch is made I will do a final round of testing, cut
the tarball, and ask Christoph and Russell to build the binaries.

If experience is any guide, after a major *.0 release we will need to
cut a bugfix release in the upcoming week or two anyhow, so hopefully
we can get as many active issues settled and released by then.

If you're not available Michael, let me know or I will infer by your
silence and try and make the branch myself from your instructions in
the developers guide.

Thanks,
JDH

I'm going top infer by your silence Michael that you may be on
vacation so I am going to proceed with making the release branch.
Fingers crossed.

JDH

···

On Mon, Jul 5, 2010 at 5:31 PM, John Hunter <jdh2358@...149...> wrote:

If you're not available Michael, let me know or I will infer by your
silence and try and make the branch myself from your instructions in
the developers guide.

Sorry, this is the first email I’ve received on the matter. I only subscribed to the list today though.
Thanks,

-Michael

···

On 6 Jul 2010 14:44, “John Hunter” <jdh2358@…149…> wrote:

On Mon, Jul 5, 2010 at 5:31 PM, John Hunter <jdh2358@…149…> wrote:

If you’re not available Michael, let me know or I will infer by your

silence and try and make the branch myself from your instructions in

the developers guide.

I’m going top infer by your silence Michael that you may be on

vacation so I am going to proceed with making the release branch.

Fingers crossed.

JDH


This SF.net email is sponsored by Sprint

What will you do first with EVO, the first 4G phone?

Visit sprint.com/firsthttp://p.sf.net/sfu/sprint-com-first


Matplotlib-devel mailing list

Matplotlib-devel@lists.sourceforge.net

https://lists.sourceforge.net/lists/listinfo/matplotlib-devel

No worries, I was referring to Michael Droettboom :slight_smile:

···

On Tue, Jul 6, 2010 at 9:46 AM, Michael Pearce <michaelppearce@...149...> wrote:

Sorry, this is the first email I've received on the matter. I only
subscribed to the list today though.\

I think I followed the instructions pretty closely, but merge tracking
still appears to be breaking. We had problems with this on the 99
main branch and Michael was at a loss to fix them.

The branch is created and you can check out and commit to it, but
merge tracking is breaking. The branch does not show up in when you
call 'svnmerge.py merge' even after doing

  svnmerge.py init
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

OR

  svnmerge.py init
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
--force

and then committing.

I am going to proceed with the release from the branch, but merge
tracking maybe FUBAR for a while.

We can fall back on svn merge I suppose if MGD can't figure out what
is wrong with this.

You can get the maintenance branch from:

  svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
mpl1

JDH

···

On Tue, Jul 6, 2010 at 8:43 AM, John Hunter <jdh2358@...149...> wrote:

On Mon, Jul 5, 2010 at 5:31 PM, John Hunter <jdh2358@...149...> wrote:

If you're not available Michael, let me know or I will infer by your
silence and try and make the branch myself from your instructions in
the developers guide.

I'm going top infer by your silence Michael that you may be on
vacation so I am going to proceed with making the release branch.
Fingers crossed.

Did you run this from a working copy of the trunk? That worked for me. (A merge init always has a from and a to, where the "to" is implied by the current working copy).

I believe (though a little testing) that merging from the branch to the trunk is now working.

Mike

···

On 07/06/2010 10:56 AM, John Hunter wrote:

On Tue, Jul 6, 2010 at 8:43 AM, John Hunter<jdh2358@...149...> wrote:
   

On Mon, Jul 5, 2010 at 5:31 PM, John Hunter<jdh2358@...149...> wrote:

If you're not available Michael, let me know or I will infer by your
silence and try and make the branch myself from your instructions in
the developers guide.
       

I'm going top infer by your silence Michael that you may be on
vacation so I am going to proceed with making the release branch.
Fingers crossed.
     
I think I followed the instructions pretty closely, but merge tracking
still appears to be breaking. We had problems with this on the 99
main branch and Michael was at a loss to fix them.

The branch is created and you can check out and commit to it, but
merge tracking is breaking. The branch does not show up in when you
call 'svnmerge.py merge' even after doing

   svnmerge.py init
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

OR

   svnmerge.py init
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
--force

and then committing.
   

--
Michael Droettboom
Science Software Branch
Space Telescope Science Institute
Baltimore, Maryland, USA

I first ran it from trunk/matplotlib, and then thought maybe you meant
trunk trunk, so I deleted the branch, recreated it, and did the
svnmerge init from trunk.

I'll test after your changes -- if I recall correctly we've been
optimistic before only to see the merge tracking disappear.

It appears to be working, though, so you clearly sprinkled your magic
pixie dust on it. Thanks for taking a look.

JDH

···

On Tue, Jul 6, 2010 at 10:34 AM, Michael Droettboom <mdroe@...31...> wrote:

Did you run this from a working copy of the trunk? That worked for me.
(A merge init always has a from and a to, where the "to" is implied by
the current working copy).

I believe (though a little testing) that merging from the branch to the
trunk is now working.