On 07/06/2010 10:56 AM, John Hunter wrote: > 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. > 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
