Revision: 5178
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5178&view=rev
Author: jdh2358
Date: 2008-05-17 14:28:34 -0700 (Sat, 17 May 2008)
Log Message:
-----------
updated the coding guide to encourage svnmerge
Modified Paths:
--------------
branches/v0_91_maint/CODING_GUIDE
Modified: branches/v0_91_maint/CODING_GUIDE
===================================================================
--- branches/v0_91_maint/CODING_GUIDE 2008-05-17 21:20:15 UTC (rev 5177)
+++ branches/v0_91_maint/CODING_GUIDE 2008-05-17 21:28:34 UTC (rev 5178)
@@ -12,7 +12,7 @@
# checking out the main src
svn co
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/matplotlib
matplotlib --username=youruser --password=yourpass
-# branch checkouts, eg the transforms branch
+# branch checkouts, eg the transforms branch
svn co
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/transforms
transbranch
== Committing changes ==
@@ -41,14 +41,33 @@
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.
+ 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
+ basic procedure is:
+
+ - 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
+
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/matplotlib)
+
+ - Michael advises making the change on the branch and committing
+ 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
+ > svnmerge.py merge -rNNN1,NNN2
+ # this file is automatically created by the merge command
+ > svn commit -F svnmerge-commit-message.txt
+
== Importing and name spaces ==
For numpy, use:
import numpy as npy
a = npy.array([1,2,3])
-
+
For masked arrays, use:
import matplotlib.numerix.npyma as ma
@@ -64,8 +83,8 @@
For matplotlib modules (or any other modules), use:
- import matplotlib.cbook as cbook
-
+ import matplotlib.cbook as cbook
+
if cbook.iterable(z):
pass
@@ -125,7 +144,7 @@
(add-hook 'python-mode-hook
(lambda ()
- (add-hook 'local-write-file-hooks 'delete-trailing-whitespace)))
+ (add-hook 'local-write-file-hooks 'delete-trailing-whitespace)))
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
