Revision: 5182
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5182&view=rev
Author: jdh2358
Date: 2008-05-17 14:39:46 -0700 (Sat, 17 May 2008)
Log Message:
-----------
Merged revisions 5181 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint
........
r5181 | jdh2358 | 2008-05-17 16:38:21 -0500 (Sat, 17 May 2008) | 1 line
fixed some typos in the CODING_GUIDE
........
Modified Paths:
--------------
trunk/matplotlib/CODING_GUIDE
Property Changed:
----------------
trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Name: svnmerge-integrated
- /branches/v0_91_maint:1-4816,5172,5178-5179
+ /branches/v0_91_maint:1-4816,5172,5178-5179,5181
Modified: trunk/matplotlib/CODING_GUIDE
===================================================================
--- trunk/matplotlib/CODING_GUIDE 2008-05-17 21:38:21 UTC (rev 5181)
+++ trunk/matplotlib/CODING_GUIDE 2008-05-17 21:39:46 UTC (rev 5182)
@@ -41,11 +41,13 @@
MANIFEST.in. This file determines what goes into the src
distribution of the mpl build.
- * Keep the maintenance branch and trunk in sync here it makes sense.
+ * Keep the maintenance branch and trunk in sync where it makes sense.
If there is a bug on both that needs fixing, use svnmerge.py to
- fix them. http://www.orcaware.com/svn/wiki/Svnmerge.py. The
+ keep them in sync. http://www.orcaware.com/svn/wiki/Svnmerge.py. The
basic procedure is:
+ - install svnmerge.py in your PATH
+
- get a svn copy of the branch (svn co
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint)
and the trunk (svn co
@@ -55,8 +57,9 @@
it. Make sure you svn upped on the trunk and have no local
modifications, and then from the svn trunk do
- # where these are the revision numbers. ranges also acceptable
+ # where the NNN are the revision numbers. ranges also acceptable
> svnmerge.py merge -rNNN1,NNN2
+
# this file is automatically created by the merge command
> svn commit -F svnmerge-commit-message.txt
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
