|
From: <jd...@us...> - 2010-07-06 14:11:27
|
Revision: 8506
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8506&view=rev
Author: jdh2358
Date: 2010-07-06 14:11:21 +0000 (Tue, 06 Jul 2010)
Log Message:
-----------
updated coding guide docs w/ new release branch
Modified Paths:
--------------
branches/v1_0_maint/doc/devel/coding_guide.rst
Modified: branches/v1_0_maint/doc/devel/coding_guide.rst
===================================================================
--- branches/v1_0_maint/doc/devel/coding_guide.rst 2010-07-06 13:59:01 UTC (rev 8505)
+++ branches/v1_0_maint/doc/devel/coding_guide.rst 2010-07-06 14:11:21 UTC (rev 8506)
@@ -24,17 +24,13 @@
svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/\
matplotlib mpl --username=youruser --password=yourpass
-Branch checkouts, eg the maintenance branch::
+Branch checkouts, eg the 1.0.x maintenance branch::
svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/\
- v0_99_maint mpl99 --username=youruser --password=yourpass
+ v1_0_maint mpl1 --username=youruser --password=yourpass
-The current release of the trunk is in the 0.99.x maintenance branch::
- svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/\
- v0_99_maint mpl99 --username=youruser --password=yourpass
-
Committing changes
------------------
@@ -96,7 +92,7 @@
svnmerge.py merge -S BRANCHNAME
Where BRANCHNAME is the name of the branch to merge *from*,
- e.g. v0_99_maint.
+ e.g. v1_0_maint.
If you wish to merge only specific revisions (in an unusual
situation), do::
@@ -130,17 +126,17 @@
with this.
* Creating a new branch from the trunk (if the release version is
- 0.99 at revision 6573)::
+ 1.0 at revision 8503)::
> svn copy \
- https://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib@7315 \
- https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint \
- -m "Creating maintenance branch for 0.99"
+ https://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib@8503 \
+ https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint \
+ -m "Creating maintenance branch for 1.0"
* You can add a new branch for the trunk to "track" using
"svnmerge.py init", e.g., from a working copy of the trunk::
- > svnmerge.py init https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint
+ > svnmerge.py init https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
property 'svnmerge-integrated' set on '.'
After doing a "svn commit" on this, this merge tracking is available
@@ -150,7 +146,7 @@
* Tracking can later be removed with the "svnmerge.py uninit" command,
e.g.::
- > svnmerge.py -S v0_99_maint uninit
+ > svnmerge.py -S v1_0_maint uninit
.. _using-git:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|