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). In the meantime, I've removed merge tracking on branches/v0_98_4_maint to trunk/matplotlib, since it's broken. Cheers, Mike Michael Droettboom wrote: > 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/%5C>v0_98_4_maint > > points to one level above the source tree. See: > > http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/branches/v0_98_4_maint/ > > Was this intentional? > > In any case, the svnmerge setup I did this morning is incorrect. Would > you like me to fix that, or would you rather remove and recreate the > branch? If we don't fix the branch, I would suggest changing the > instructions for checking out the branch to: > > svn co > https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/ > <https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/%5C>v0_98_4_maint/matplotlib > > mpl98.4 > > Cheers, > Mike > > John Hunter wrote: > >> On Wed, Dec 10, 2008 at 11:30 AM, Michael Droettboom <[EMAIL PROTECTED] >> <mailto:[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 I'd run it by you first -- it means we're >> effectively abandoning the 0.91.x series, or at least saying any >> bugfixes to it will have to be manually brought over to 0.98.x. >> >> >> Thanks for the notes -- I'l incorporate them into the dev guide. >> >> I definitely do not want to abandon the 91 branch. I expect this >> branch to last a while, perhaps a year. the 98.4 branch is intended >> to be short lived, order of a week or two, just to fix critical bugs >> for this release. Or better yet, we keep it alive until the next >> point release, then kill it and make a new release branch. That way >> if we ever need to fix a critical bug in the latest release, we can go >> to the branch w/o having all the testing required on the head. Since >> the major incompatibility was between 91 and 98, I anticipate that >> there are some users with a lot of code (eg an axes3d dependency) >> where moving may never be feasible. >> >> JDH >> > > > ------------------------------------------------------------------------------ > SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. > The future of the web can't happen without you. Join us at MIX09 to help > pave the way to the Next Web now. Learn more and register at > http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ > _______________________________________________ > Matplotlib-devel mailing list > Matplotlib-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/matplotlib-devel > ------------------------------------------------------------------------------ SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
