Revision: 6754
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6754&view=rev
Author: mdboom
Date: 2009-01-06 20:51:53 +0000 (Tue, 06 Jan 2009)
Log Message:
-----------
Update git instructions with information about working on branches.
Modified Paths:
--------------
branches/v0_98_5_maint/doc/devel/coding_guide.rst
Modified: branches/v0_98_5_maint/doc/devel/coding_guide.rst
===================================================================
--- branches/v0_98_5_maint/doc/devel/coding_guide.rst 2009-01-06 20:31:33 UTC
(rev 6753)
+++ branches/v0_98_5_maint/doc/devel/coding_guide.rst 2009-01-06 20:51:53 UTC
(rev 6754)
@@ -171,7 +171,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
@@ -221,6 +221,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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
