From: <md...@us...> - 2009-01-06 20:57:30
|
Revision: 6755 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6755&view=rev Author: mdboom Date: 2009-01-06 20:57:28 +0000 (Tue, 06 Jan 2009) Log Message: ----------- Merged revisions 6752,6754 via svnmerge from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6752 | efiring | 2009-01-06 14:56:03 -0500 (Tue, 06 Jan 2009) | 2 lines Backport 6745, 6746 from trunk ........ r6754 | mdboom | 2009-01-06 15:51:53 -0500 (Tue, 06 Jan 2009) | 1 line Update git instructions with information about working on branches. ........ Modified Paths: -------------- trunk/matplotlib/doc/devel/coding_guide.rst trunk/matplotlib/lib/matplotlib/contour.py Property Changed: ---------------- trunk/matplotlib/ trunk/matplotlib/doc/pyplots/README trunk/matplotlib/doc/sphinxext/gen_gallery.py trunk/matplotlib/doc/sphinxext/gen_rst.py Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6732 + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6754 Modified: svn:mergeinfo - /branches/v0_91_maint:5753-5771 /branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732 + /branches/v0_91_maint:5753-5771 /branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754 Modified: trunk/matplotlib/doc/devel/coding_guide.rst =================================================================== --- trunk/matplotlib/doc/devel/coding_guide.rst 2009-01-06 20:51:53 UTC (rev 6754) +++ trunk/matplotlib/doc/devel/coding_guide.rst 2009-01-06 20:57:28 UTC (rev 6755) @@ -174,7 +174,7 @@ cd mpl.git git config --add remote.origin.fetch +refs/remotes/*:refs/remotes/* git fetch - git svn init --trunk=trunk/matplotlib --tags=tags https://matplotlib.svn.sourceforge.net/svnroot/matplotlib + git svn init --branches=branches --trunk=trunk/matplotlib --tags=tags https://matplotlib.svn.sourceforge.net/svnroot/matplotlib # Now just get the latest svn revisions from the SourceForge SVN repository git svn fetch -r 6300:HEAD @@ -224,6 +224,37 @@ git checkout whizbang-branch git rebase master +Working on a maintenance branch from git +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The matplotlib maintenance branches are also available through git. +(Note that the ``git svn init`` line in the instructions above was +updated to make this possible. If you created your git mirror without +a ``--branches`` option, you will need to perform all of the steps +again in a new directory). + +You can see which branches are available with:: + + git branch -a + +To switch your working copy to the 0.98.5 maintenance branch:: + + git checkout v0_98_5_maint + +Then you probably want to (as above) create a new local branch based +on that branch:: + + git checkout -b whizbang-branch + +When you ``git svn dcommit`` from a maintenance branch, it will commit +to that branch, not to the trunk. + +While it should theoretically be possible to perform merges from a git +maintenance branch to a git trunk and then commit those changes back +to the SVN trunk, I have yet to find the magic incantation to make +that work. However, svnmerge as described `above <svn-merge>`_ can be +used and in fact works quite well. + A note about git write access ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Property changes on: trunk/matplotlib/doc/pyplots/README ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732 + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754 Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732 + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754 Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732 + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754 Modified: trunk/matplotlib/lib/matplotlib/contour.py =================================================================== --- trunk/matplotlib/lib/matplotlib/contour.py 2009-01-06 20:51:53 UTC (rev 6754) +++ trunk/matplotlib/lib/matplotlib/contour.py 2009-01-06 20:57:28 UTC (rev 6755) @@ -875,6 +875,8 @@ tlinestyles = tlinestyles[:Nlev] else: raise ValueError("Unrecognized type for linestyles kwarg") + elif cbook.iterable(linestyles): # len(linestyles) >= Nlev + tlinestyles = list(linestyles)[:Nlev] return tlinestyles def get_alpha(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |