@@ -24,15 +24,11 @@ Checking out the main source::
2424 svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/\
2525 matplotlib mpl --username=youruser --password=yourpass
2626
27- Branch checkouts, eg the maintenance branch::
27+ Branch checkouts, eg the 1.0.x maintenance branch::
2828
2929 svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/\
30- v0_99_maint mpl99 --username=youruser --password=yourpass
30+ v1_0_maint mpl1 --username=youruser --password=yourpass
3131
32- The current release of the trunk is in the 0.99.x maintenance branch::
33-
34- svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/\
35- v0_99_maint mpl99 --username=youruser --password=yourpass
3632
3733
3834Committing changes
@@ -96,7 +92,7 @@ The basic procedure is:
9692 svnmerge.py merge -S BRANCHNAME
9793
9894 Where BRANCHNAME is the name of the branch to merge *from *,
99- e.g. v0_99_maint .
95+ e.g. v1_0_maint .
10096
10197 If you wish to merge only specific revisions (in an unusual
10298 situation), do::
@@ -130,17 +126,17 @@ Setting up svnmerge
130126 with this.
131127
132128* Creating a new branch from the trunk (if the release version is
133- 0.99 at revision 6573 )::
129+ 1.0 at revision 8503 )::
134130
135131 > svn copy \
136- https://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib@7315 \
137- https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint \
138- -m "Creating maintenance branch for 0.99 "
132+ https://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib@8503 \
133+ https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint \
134+ -m "Creating maintenance branch for 1.0 "
139135
140136* You can add a new branch for the trunk to "track" using
141137 "svnmerge.py init", e.g., from a working copy of the trunk::
142138
143- > svnmerge.py init https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint
139+ > svnmerge.py init https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
144140 property 'svnmerge-integrated' set on '.'
145141
146142 After doing a "svn commit" on this, this merge tracking is available
@@ -150,7 +146,7 @@ Setting up svnmerge
150146* Tracking can later be removed with the "svnmerge.py uninit" command,
151147 e.g.::
152148
153- > svnmerge.py -S v0_99_maint uninit
149+ > svnmerge.py -S v1_0_maint uninit
154150
155151.. _using-git :
156152
0 commit comments