Re: [matplotlib-devel] branching for 1.0
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 jdh2...@gmail.com wrote: On Mon, Jul 5, 2010 at 5:31 PM, John Hunter jdh2...@gmail.com 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/first -- http://p.sf.net/sfu/sprint-com-first ___ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel -- This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first___ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
Re: [matplotlib-devel] branching for 1.0
On Tue, Jul 6, 2010 at 9:46 AM, Michael Pearce michaelppea...@gmail.com wrote: Sorry, this is the first email I've received on the matter. I only subscribed to the list today though.\ No worries, I was referring to Michael Droettboom :-) -- This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first ___ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
Re: [matplotlib-devel] branching for 1.0
On Tue, Jul 6, 2010 at 8:43 AM, John Hunter jdh2...@gmail.com wrote: On Mon, Jul 5, 2010 at 5:31 PM, John Hunter jdh2...@gmail.com 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. 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 -- This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first ___ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
Re: [matplotlib-devel] branching for 1.0
On 07/06/2010 10:56 AM, John Hunter wrote: On Tue, Jul 6, 2010 at 8:43 AM, John Hunterjdh2...@gmail.com wrote: On Mon, Jul 5, 2010 at 5:31 PM, John Hunterjdh2...@gmail.com 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. 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 -- Michael Droettboom Science Software Branch Space Telescope Science Institute Baltimore, Maryland, USA -- This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first ___ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
Re: [matplotlib-devel] branching for 1.0
On Tue, Jul 6, 2010 at 10:34 AM, Michael Droettboom md...@stsci.edu 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. 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 -- This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first ___ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
